1 files changed, 1 insertions, 2 deletions
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) {