diff --git a/ChangeLog b/ChangeLog
index 12afe012ba..5b62831f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 30 18:19:00 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval): fix SEGV at retry in iterator's receiver.
+	  [ruby-dev:23227]
+
 Mon Mar 29 20:17:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (rb_exec): follow older behavior if close-on-exec is not
diff --git a/eval.c b/eval.c
index 3adf63dfd7..7d3342f5a2 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) {