diff options
| author | John Hawthorn <john@hawthorn.email> | 2025-03-04 12:54:33 -0800 |
|---|---|---|
| committer | John Hawthorn <john@hawthorn.email> | 2025-03-05 14:05:24 -0800 |
| commit | 443e2ec27db89c896bd62994f6e04d8d6d48cddb (patch) | |
| tree | 3b9d3eed764ef28306b8a70e9efe28e2a28c2918 /test | |
| parent | c224ca4feaff20cab03d76439bcbfb35d4e2f6b1 (diff) | |
Replace tombstone when converting AR to ST hash
[Bug #21170]
st_table reserves -1 as a special hash value to indicate that an entry
has been deleted. So that that's a valid value to be returned from the
hash function, do_hash replaces -1 with 0 so that it is not mistaken for
the sentinel.
Previously, when upgrading an AR table to an ST table,
rb_st_add_direct_with_hash was used which did not perform the same
conversion, this could lead to a hash in a broken state where one if its
entries which was supposed to exist being marked as a tombstone.
The hash could then become further corrupted when the ST table required
resizing as the falsely tombstoned entry would be skipped but it would
be counted in num entries, leading to an uninitialized entry at index
15.
In most cases this will be really rare, unless using a very poorly
implemented custom hash function.
This also adds two debug assertions, one that st_add_direct_with_hash
does not receive the reserved hash value, and a second in
rebuild_table_with, which ensures that after we rebuild/compact a table
it contains the expected number of elements.
Co-authored-by: Alan Wu <alanwu@ruby-lang.org>
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/12852
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_hash.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 87eb1912d9..1e1b37f981 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -2389,4 +2389,18 @@ class TestHashOnly < Test::Unit::TestCase end end; end + + def test_ar_to_st_reserved_value + klass = Class.new do + attr_reader :hash + def initialize(val) = @hash = val + end + + values = 0.downto(-16).to_a + hash = {} + values.each do |val| + hash[klass.new(val)] = val + end + assert_equal values, hash.values, "[ruby-core:121239] [Bug #21170]" + end end |
