aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-20 17:47:02 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-20 17:47:02 +0000
commit052f7f27f2ba3415162d5068958e46a3988e5e08 (patch)
tree91e37407e0fba38e14f46b4d72dca40a1cba294e
parentc8b20d0877a1c47c726f6128d98557ee6da09060 (diff)
downloadruby-052f7f27f2ba3415162d5068958e46a3988e5e08.tar.gz
* vm_eval.c (rb_iterate): remove SEGV (retry).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--vm_eval.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c7c3877a07..369430eb1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 21 02:45:46 2009 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * vm_eval.c (rb_iterate): remove SEGV (retry).
+
Sun Dec 20 23:18:23 2009 Yusuke Endoh <mame@tsg.ne.jp>
* vm_eval.c (rb_iterate): remove SEGV (use the original patch).
diff --git a/vm_eval.c b/vm_eval.c
index 889edee9d4..2d16ba6653 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -832,7 +832,7 @@ rb_iterate(VALUE (* it_proc) (VALUE), VALUE data1,
rb_block_t *blockptr;
if (bl_proc) {
blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(th->cfp);
- blockptr->iseq = (void *)NEW_IFUNC(bl_proc, data2);
+ blockptr->iseq = (void *)node;
blockptr->proc = 0;
}
else {