diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 07:29:44 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 07:29:44 +0000 |
commit | 280d4c3733a27fee527a11004df45c1c255d03c8 (patch) | |
tree | ac381d266d59d55e9604b62f74546d3527fc37ca /proc.c | |
parent | d88957abad479e3580dc646ab32707a9aaa80c11 (diff) |
* proc.c (proc_binding): fix segmentation fault on marking phase.
envptr of newenvval should not be NULL.
You can reproduce by
make test-all TESTS='--gc-stress -n test_to_proc_binding ruby/test_method.rb'
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -2510,15 +2510,16 @@ 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; - 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; + rb_env_t *newenv; + VALUE newenvval; + newenv = xmalloc(sizeof(rb_env_t) + ((local_size + 1) * sizeof(VALUE))); 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; } |