diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 12:34:26 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 12:34:26 +0000 |
commit | 3875df97f1ff78c376543a2c3cb32ab6aada69bc (patch) | |
tree | 2faa35c2634561a04d05bc25363c31044ee98d4b /proc.c | |
parent | f5299e93a7914e8ba588031a0603014c73a6c3fa (diff) |
proc.c, vm.c: fix possible memory leak
* proc.c (proc_binding): fix possible memory leak of rb_env_t when
TypedData_Wrap_Struct failed.
* vm.c (vm_make_env_each): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -2510,16 +2510,15 @@ proc_binding(VALUE self) if (iseq && env->local_size < iseq->local_size) { int prev_local_size = env->local_size; int local_size = iseq->local_size; - rb_env_t *newenv; - VALUE newenvval; - newenv = xmalloc(sizeof(rb_env_t) + ((local_size + 1) * sizeof(VALUE))); + VALUE newenvval = TypedData_Wrap_Struct(RBASIC_CLASS(envval), RTYPEDDATA_TYPE(envval), 0); + rb_env_t *newenv = xmalloc(sizeof(rb_env_t) + ((local_size + 1) * sizeof(VALUE))); + RTYPEDDATA_DATA(newenvval) = newenv; newenv->env_size = local_size + 2; newenv->local_size = local_size; newenv->prev_envval = env->prev_envval; newenv->block = env->block; MEMCPY(newenv->env, env->env, VALUE, prev_local_size + 1); rb_mem_clear(newenv->env + prev_local_size + 1, local_size - prev_local_size); - newenvval = TypedData_Wrap_Struct(RBASIC_CLASS(envval), RTYPEDDATA_TYPE(envval), newenv); newenv->env[local_size + 1] = newenvval; envval = newenvval; } |