From bbd6558ade327c2a9912454dadebba12c7c82db1 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 30 Mar 2004 09:19:06 +0000 Subject: * eval.c (rb_eval): fix SEGV at retry in iterator's receiver. [ruby-dev:23227] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12afe012b..5b62831f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 30 18:19:00 2004 Nobuyoshi Nakada + + * eval.c (rb_eval): fix SEGV at retry in iterator's receiver. + [ruby-dev:23227] + Mon Mar 29 20:17:16 2004 Nobuyoshi Nakada * process.c (rb_exec): follow older behavior if close-on-exec is not diff --git a/eval.c b/eval.c index 3adf63dfd..7d3342f5a 100644 --- a/eval.c +++ b/eval.c @@ -2959,7 +2959,7 @@ rb_eval(self, n) result = prot_tag->retval; state = 0; } - else if (state == TAG_RETRY) { + else if (state == TAG_RETRY && ruby_block == &_block) { state = 0; goto iter_retry; } @@ -4537,7 +4537,6 @@ break_jump(retval) VALUE retval; { struct tag *tt = prot_tag; - int yield = Qfalse; if (retval == Qundef) retval = Qnil; while (tt) { -- cgit