1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

st.c: Do not clear entries_bound when calling Hash#shift for empty hash

tab->entries_bound is used to check if the bins are full in
rebuild_table_if_necessary.

Hash#shift against an empty hash assigned 0 to tab->entries_bound, but
didn't clear the bins. Thus, the table is not rebuilt even when the bins
are full. Attempting to add a new element into full-bin hash gets stuck.

This change stops clearing tab->entries_bound in Hash#shift.
[Bug #18578]
This commit is contained in:
Yusuke Endoh 2022-02-09 18:24:17 +09:00
parent 8013250136
commit 496591de96
Notes: git 2022-02-10 00:14:57 +09:00
2 changed files with 13 additions and 1 deletions

1
st.c
View file

@ -1363,7 +1363,6 @@ st_shift(st_table *tab, st_data_t *key, st_data_t *value)
return 1;
}
}
tab->entries_start = tab->entries_bound = 0;
if (value != 0) *value = 0;
return 0;
}

View file

@ -1069,6 +1069,19 @@ class TestHash < Test::Unit::TestCase
assert_nil(h.shift)
end
def test_shift_for_empty_hash
# [ruby-dev:51159]
h = @cls[]
100.times{|n|
while h.size < n
k = Random.rand 0..1<<30
h[k] = 1
end
0 while h.shift
assert_equal({}, h)
}
end
def test_reject_bang2
assert_equal({1=>2}, @cls[1=>2,3=>4].reject! {|k, v| k + v == 7 })
assert_nil(@cls[1=>2,3=>4].reject! {|k, v| k == 5 })