1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proc.c: rb_proc_alloc

Browse Source 
* 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
This commit is contained in:
nobu 2015-05-16 12:21:25 +00:00
parent ecbad6dfa8
commit ec0a083d93
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proc.c
View File

@ -71,11 +71,10 @@ static const rb_data_type_t proc_data_type = {
}; };
VALUE VALUE
rb_proc_wrap(VALUE klass, rb_proc_t *proc) rb_proc_alloc(VALUE klass)
{ {
proc->block.proc = TypedData_Wrap_Struct(klass, &proc_data_type, proc); rb_proc_t *proc;
return TypedData_Make_Struct(klass, rb_proc_t, &proc_data_type, proc);
return proc->block.proc;
} }
VALUE VALUE
@ -95,11 +94,13 @@ proc_dup(VALUE self)
{ {
VALUE procval; VALUE procval;
rb_proc_t *src; rb_proc_t *src;
rb_proc_t *dst = ALLOC(rb_proc_t); rb_proc_t *dst;
GetProcPtr(self, src); GetProcPtr(self, src);
procval = rb_proc_alloc(rb_cProc);
GetProcPtr(procval, dst);
*dst = *src; *dst = *src;
procval = rb_proc_wrap(rb_cProc, dst); dst->block.proc = procval;
RB_GC_GUARD(self); /* for: body = proc_dup(body) */ RB_GC_GUARD(self); /* for: body = proc_dup(body) */
return procval; return procval;

22
vm.c
View File

@ -658,24 +658,18 @@ vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block)
} }
static inline VALUE static inline VALUE
rb_proc_alloc(VALUE klass, const rb_block_t *block, rb_proc_create(VALUE klass, const rb_block_t *block,
VALUE envval, VALUE blockprocval, VALUE envval, VALUE blockprocval,
int8_t safe_level, int8_t is_from_method, int8_t is_lambda) int8_t safe_level, int8_t is_from_method, int8_t is_lambda)
{ {
VALUE procval; VALUE procval = rb_proc_alloc(klass);
rb_proc_t *proc = ALLOC(rb_proc_t); rb_proc_t *proc = RTYPEDDATA_DATA(procval);
proc->block = *block; proc->block = *block;
proc->block.proc = procval;
proc->safe_level = safe_level; proc->safe_level = safe_level;
proc->is_from_method = is_from_method; proc->is_from_method = is_from_method;
proc->is_lambda = is_lambda; 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->envval = envval;
proc->blockprocval = blockprocval; 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); check_env_value(envval);
} }
procval = rb_proc_alloc(klass, block, envval, blockprocval, procval = rb_proc_create(klass, block, envval, blockprocval,
(int8_t)th->safe_level, 0, is_lambda); (int8_t)th->safe_level, 0, is_lambda);
if (VMDEBUG) { if (VMDEBUG) {
if (th->stack < block->ep && block->ep < th->stack + th->stack_size) { if (th->stack < block->ep && block->ep < th->stack + th->stack_size) {

2
vm_core.h
View File

@ -920,7 +920,7 @@ rb_block_t *rb_vm_control_frame_block_ptr(const rb_control_frame_t *cfp);
/* VM related object allocate functions */ /* VM related object allocate functions */
VALUE rb_thread_alloc(VALUE klass); VALUE rb_thread_alloc(VALUE klass);
VALUE rb_proc_wrap(VALUE klass, rb_proc_t *); /* may use with rb_proc_alloc */ VALUE rb_proc_alloc(VALUE klass);
VALUE rb_binding_alloc(VALUE klass); VALUE rb_binding_alloc(VALUE klass);
/* for debug */ /* for debug */