From a73d958c33904fdabac95f49d9834779ca33c599 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 10 Mar 2012 14:52:19 +0000 Subject: * st.c: add st_foreach_check for fixing iteration over packed table and st_delete_safe. patched by Sokolov Yura at https://github.com/ruby/ruby/pull/84 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'hash.c') diff --git a/hash.c b/hash.c index dbd7082540..560b32e29a 100644 --- a/hash.c +++ b/hash.c @@ -116,7 +116,6 @@ foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg) { int status; - if (key == Qundef) return ST_CONTINUE; status = (*arg->func)(key, value, arg->arg); if (status == ST_CONTINUE) { return ST_CHECK; @@ -132,7 +131,7 @@ st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a) arg.tbl = table; arg.func = (st_foreach_func *)func; arg.arg = a; - if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) { + if (st_foreach_check(table, foreach_safe_i, (st_data_t)&arg, Qundef)) { rb_raise(rb_eRuntimeError, "hash modified during iteration"); } } @@ -187,7 +186,7 @@ hash_foreach_ensure(VALUE hash) static VALUE hash_foreach_call(struct hash_foreach_arg *arg) { - if (st_foreach(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg)) { + if (st_foreach_check(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg, Qundef)) { rb_raise(rb_eRuntimeError, "hash modified during iteration"); } return Qnil; -- cgit v1.2.3