From 04c7fa0f3b96ce7d94c85f2728a53d3984a66937 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Nov 2013 02:35:40 +0000
Subject: [PATCH] hash.c: restore iter_lev

* hash.c (hash_foreach_ensure): restore iter_lev to the previous
  value, not just decrement.  [ruby-dev:47803] [Bug #9105]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  5 ++++-
 hash.c                 | 12 ++++++++----
 test/ruby/test_hash.rb | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e8b22e036..04f78677bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Thu Nov 14 11:33:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 14 11:35:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (hash_foreach_ensure): restore iter_lev to the previous
+	  value, not just decrement.  [ruby-dev:47803] [Bug #9105]
 
 	* hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected
 	  by ST_CHECK.
diff --git a/hash.c b/hash.c
index a37318be85..754685eb10 100644
--- a/hash.c
+++ b/hash.c
@@ -173,6 +173,7 @@ struct hash_foreach_arg {
     VALUE hash;
     rb_foreach_func *func;
     VALUE arg;
+    int iter_lev;
 };
 
 static int
@@ -201,9 +202,12 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
 }
 
 static VALUE
-hash_foreach_ensure(VALUE hash)
+hash_foreach_ensure(VALUE arg)
 {
-    if (--RHASH_ITER_LEV(hash) == 0) {
+    struct hash_foreach_arg *argp = (struct hash_foreach_arg *)arg;
+    VALUE hash = argp->hash;
+
+    if ((RHASH_ITER_LEV(hash) = argp->iter_lev) == 0) {
 	if (FL_TEST(hash, HASH_DELETED)) {
 	    st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef);
 	    FL_UNSET(hash, HASH_DELETED);
@@ -229,11 +233,11 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
 
     if (!RHASH(hash)->ntbl)
         return;
-    RHASH_ITER_LEV(hash)++;
     arg.hash = hash;
     arg.func = (rb_foreach_func *)func;
     arg.arg  = farg;
-    rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
+    arg.iter_lev = RHASH_ITER_LEV(hash)++;
+    rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, (VALUE)&arg);
 }
 
 static VALUE
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 9bbe48cf33..e998c52621 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -930,6 +930,22 @@ class TestHash < Test::Unit::TestCase
       h.clear
       c.call
     end
+
+    bug9105 = '[ruby-dev:47803] [Bug #9105]'
+    h = @cls[1=>2, 3=>4]
+    c = nil
+    f = false
+    h.each {callcc {|c2| c = c2}}
+    unless f
+      f = true
+      c.call
+    end
+    assert_nothing_raised(RuntimeError, bug9105) do
+      h.each {|i, j|
+        h.delete(i);
+        assert_not_equal(false, i, bug9105)
+      }
+    end
   end
 
   def test_compare_by_identity