summaryrefslogtreecommitdiffstats
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 03:49:09 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-25 03:49:09 +0000
commitf291e3028c9f9ea742cbd89869ef73053936a858 (patch)
treee62cececf121e94b99a4e3b32021c7970ea1902d /vm_insnhelper.c
parentb38e583c46222f2d44c2233e62eaa77c4ba32a99 (diff)
downloadruby-f291e3028c9f9ea742cbd89869ef73053936a858.tar.gz
ruby-f291e3028c9f9ea742cbd89869ef73053936a858.tar.xz
ruby-f291e3028c9f9ea742cbd89869ef73053936a858.zip
* vm_insnhelper.c (vm_yield_with_cfunc): check block has Proc.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 46c11a6de..13bd03dc6 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -661,7 +661,12 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block,
}
if (blockptr) {
- blockarg = vm_make_proc(th, blockptr, rb_cProc);
+ if (blockptr->proc) {
+ blockarg = blockptr->proc;
+ }
+ else {
+ blockarg = vm_make_proc(th, blockptr, rb_cProc);
+ }
}
else {
blockarg = Qnil;