1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hash.c: restore iter_lev

Browse Source 
* 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
This commit is contained in:
nobu 2013-11-14 02:35:40 +00:00
parent b0af0592fd
commit 04c7fa0f3b
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 * hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected
by ST_CHECK. by ST_CHECK.

12
hash.c
View File

@ -173,6 +173,7 @@ struct hash_foreach_arg {
VALUE hash; VALUE hash;
rb_foreach_func *func; rb_foreach_func *func;
VALUE arg; VALUE arg;
int iter_lev;
}; };
static int 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 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)) { if (FL_TEST(hash, HASH_DELETED)) {
st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef); st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef);
FL_UNSET(hash, HASH_DELETED); FL_UNSET(hash, HASH_DELETED);
@ -229,11 +233,11 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
if (!RHASH(hash)->ntbl) if (!RHASH(hash)->ntbl)
return; return;
RHASH_ITER_LEV(hash)++;
arg.hash = hash; arg.hash = hash;
arg.func = (rb_foreach_func *)func; arg.func = (rb_foreach_func *)func;
arg.arg = farg; 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 static VALUE

16
test/ruby/test_hash.rb
View File

@ -930,6 +930,22 @@ class TestHash < Test::Unit::TestCase
h.clear h.clear
c.call c.call
end 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 end
def test_compare_by_identity def test_compare_by_identity