From 6d6fe7fe6b430c39bcb05106994eb67a9486d580 Mon Sep 17 00:00:00 2001 From: kosaki Date: Wed, 19 Jan 2011 03:21:52 +0000 Subject: [PATCH] * proc.c (proc_call): Add gc guard to avoid segfault. The fix is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ proc.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f55f8cc0f8..31bde880e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 19 13:04:16 2011 KOSAKI Motohiro + + * proc.c (proc_call): Add gc guard to avoid segfault. The fix + is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963] + Wed Jan 19 12:08:08 2011 Eric Hodel * lib/rubygems/commands/dependency_command.rb: Remove require of diff --git a/proc.c b/proc.c index 9ecf62656e..18c7393536 100644 --- a/proc.c +++ b/proc.c @@ -543,16 +543,16 @@ proc_call(int argc, VALUE *argv, VALUE procval) rb_proc_t *proc; rb_block_t *blockptr = 0; rb_iseq_t *iseq; + VALUE passed_procval; GetProcPtr(procval, proc); iseq = proc->block.iseq; if (BUILTIN_TYPE(iseq) == T_NODE || iseq->arg_block != -1) { if (rb_block_given_p()) { - rb_proc_t *proc; - VALUE procval; - procval = rb_block_proc(); - GetProcPtr(procval, proc); - blockptr = &proc->block; + rb_proc_t *passed_proc; + RB_GC_GUARD(passed_procval) = rb_block_proc(); + GetProcPtr(passed_procval, passed_proc); + blockptr = &passed_proc->block; } }