summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-19 03:21:52 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-19 03:21:52 +0000
commit6d6fe7fe6b430c39bcb05106994eb67a9486d580 (patch)
tree4896fc27726e0098fa19a7ed5f080bb329d6fd20 /proc.c
parent84e892f85925b62bb538e811538bb34df392170d (diff)
* 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
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c10
1 files changed, 5 insertions, 5 deletions
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;
}
}