aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--st.c16
-rw-r--r--test/ruby/test_hash.rb11
3 files changed, 27 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2af477710d..b66155eff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 20 12:57:15 2014 Masaya Tarui <tarui@ruby-lang.org>
+
+ * st.c (st_foreach_check): chnage start point of search at check
+ from top to current. [ruby-dev:48047] [Bug #9646]
+
Sun Apr 20 08:41:33 2014 Andrew DeMaria <ademariad@gmail.com>
* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
diff --git a/st.c b/st.c
index ccf22eef4d..ff5bb305ab 100644
--- a/st.c
+++ b/st.c
@@ -342,9 +342,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++;
@@ -352,6 +351,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
@@ -910,9 +915,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 7cf5b8a98d..9fe64b38a0 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -1088,6 +1088,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