diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | st.c | 16 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 11 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 28 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Mon Jul 7 12:57:26 2014 Masaya Tarui <tarui@ruby-lang.org> + + * st.c (st_foreach_check): change start point of search at check + from top to current. [ruby-dev:48047] [Bug #9646] + Mon Jul 7 12:53:45 2014 Zachary Scott <e@zzak.io> * lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543] @@ -393,9 +393,8 @@ find_entry(st_table *table, st_data_t key, st_index_t hash_val, st_index_t bin_p } static inline st_index_t -find_packed_index(st_table *table, st_index_t hash_val, st_data_t key) +find_packed_index_from(st_table *table, st_index_t hash_val, st_data_t key, st_index_t i) { - st_index_t i = 0; while (i < table->real_entries && (PHASH(table, i) != hash_val || !EQUAL(table, key, PKEY(table, i)))) { i++; @@ -403,6 +402,12 @@ find_packed_index(st_table *table, st_index_t hash_val, st_data_t key) return i; } +static inline st_index_t +find_packed_index(st_table *table, st_index_t hash_val, st_data_t key) +{ + return find_packed_index_from(table, hash_val, key, 0); +} + #define collision_check 0 int @@ -934,9 +939,10 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t if (PHASH(table, i) == 0 && PKEY(table, i) == never) { break; } - i = find_packed_index(table, hash, key); - if (i == table->real_entries) { - goto deleted; + i = find_packed_index_from(table, hash, key, i); + if (i >= table->real_entries) { + i = find_packed_index(table, hash, key); + if (i >= table->real_entries) goto deleted; } /* fall through */ case ST_CONTINUE: diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index b545395780..cc7555fc5e 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -951,6 +951,17 @@ class TestHash < Test::Unit::TestCase assert_predicate(h.dup, :compare_by_identity?, bug8703) end + def test_same_key + bug9646 = '[ruby-dev:48047] [Bug #9646] Infinite loop at Hash#each' + h = @cls[a=[], 1] + a << 1 + h[[]] = 2 + a.clear + cnt = 0 + r = h.each{ break nil if (cnt+=1) > 100 } + assert_not_nil(r,bug9646) + end + class ObjWithHash def initialize(value, hash) @value = value @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-07-07" -#define RUBY_PATCHLEVEL 529 +#define RUBY_PATCHLEVEL 530 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 7 |