diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-16 12:21:25 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-16 12:21:25 +0000 |
commit | ec0a083d93f67ae354eddb0ec9bc4ab39b944394 (patch) | |
tree | b85ff7f36ca3b8db3f9f27c0405bffabb8e29e27 /vm.c | |
parent | ecbad6dfa87b78832294e3eff7a64f5d94215f87 (diff) | |
download | ruby-ec0a083d93f67ae354eddb0ec9bc4ab39b944394.tar.gz |
proc.c: rb_proc_alloc
* proc.c (rb_proc_alloc, proc_dup): allocate rb_proc_t instead of
wrapping to get rid of potential memory leak.
* vm.c (rb_proc_create): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 22 |
1 files changed, 8 insertions, 14 deletions
@@ -658,24 +658,18 @@ vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block) } static inline VALUE -rb_proc_alloc(VALUE klass, const rb_block_t *block, - VALUE envval, VALUE blockprocval, - int8_t safe_level, int8_t is_from_method, int8_t is_lambda) +rb_proc_create(VALUE klass, const rb_block_t *block, + VALUE envval, VALUE blockprocval, + int8_t safe_level, int8_t is_from_method, int8_t is_lambda) { - VALUE procval; - rb_proc_t *proc = ALLOC(rb_proc_t); + VALUE procval = rb_proc_alloc(klass); + rb_proc_t *proc = RTYPEDDATA_DATA(procval); proc->block = *block; + proc->block.proc = procval; proc->safe_level = safe_level; proc->is_from_method = is_from_method; proc->is_lambda = is_lambda; - - procval = rb_proc_wrap(klass, proc); - - /* - * ensure VALUEs are markable here as rb_proc_wrap may trigger allocation - * and clobber envval + blockprocval - */ proc->envval = envval; proc->blockprocval = blockprocval; @@ -704,8 +698,8 @@ rb_vm_make_proc_lambda(rb_thread_t *th, const rb_block_t *block, VALUE klass, in check_env_value(envval); } - procval = rb_proc_alloc(klass, block, envval, blockprocval, - (int8_t)th->safe_level, 0, is_lambda); + procval = rb_proc_create(klass, block, envval, blockprocval, + (int8_t)th->safe_level, 0, is_lambda); if (VMDEBUG) { if (th->stack < block->ep && block->ep < th->stack + th->stack_size) { |