diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-06 04:43:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-06 04:43:48 +0000 |
commit | 5714a26b90b40846733fb2a5764d4c61285f5ea1 (patch) | |
tree | 3e6602e764c51d275207b3b5eaf6ab98acd04963 /test/ruby | |
parent | 1e95f9da8840d9163b8d781293af84b0c2e99180 (diff) | |
download | ruby-5714a26b90b40846733fb2a5764d4c61285f5ea1.tar.gz |
switching hash removal
* st.h (struct st_hash_type): Remove strong_hash.
(struct st_table): Remove inside_rebuild_p and curr_hash.
* st.c (do_hash): Use type->hash instead of curr_hash.
(make_tab_empty): Remove setting up curr_hash.
(st_init_table_with_size): Remove setting up inside_rebuild_p.
(rebuild_table): Remove clearing inside_rebuild_p.
(reset_entry_hashes, HIT_THRESHOULD_FOR_STRONG_HASH): Remove code
recognizing a denial attack and switching to strong hash.
* hash.c (rb_dbl_long_hash, rb_objid_hash, rb_ident_hash): Use
rb_hash_start to randomize the hash.
(str_seed): Remove.
(any_hash): Remove strong_p and use always rb_str_hash for
strings.
(any_hash_weak, rb_any_hash_weak): Remove.
(st_hash_type objhash): Remove rb_any_hash_weak.
based on the patch by Vladimir N Makarov <vmakarov@redhat.com> at
[ruby-core:78490]. [Bug #13002]
* test/ruby/test_hash.rb (test_wrapper): objects other than special
constants should be able to be wrapped.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/test_hash.rb | 41 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 12 |
2 files changed, 40 insertions, 13 deletions
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index fdb65ae6ca..679bd2702a 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1302,7 +1302,7 @@ class TestHash < Test::Unit::TestCase assert_no_memory_leak([], prepare, code, bug9187) end - def test_wrapper_of_special_const + def test_wrapper bug9381 = '[ruby-core:59638] [Bug #9381]' wrapper = Class.new do @@ -1323,6 +1323,7 @@ class TestHash < Test::Unit::TestCase 5, true, false, nil, 0.0, 1.72723e-77, :foo, "dsym_#{self.object_id.to_s(16)}_#{Time.now.to_i.to_s(16)}".to_sym, + "str", ].select do |x| hash = {x => bug9381} hash[wrapper.new(x)] != bug9381 @@ -1330,6 +1331,44 @@ class TestHash < Test::Unit::TestCase assert_empty(bad, bug9381) end + def assert_hash_random(obj, dump = obj.inspect) + a = [obj.hash.to_s] + 3.times { + assert_in_out_err(["-e", "print #{dump}.hash"], "") do |r, e| + a += r + assert_equal([], e) + end + } + assert_not_equal([obj.hash.to_s], a.uniq) + assert_operator(a.uniq.size, :>, 2, proc {a.inspect}) + end + + def test_string_hash_random + assert_hash_random('abc') + end + + def test_symbol_hash_random + assert_hash_random(:-) + assert_hash_random(:foo) + assert_hash_random("dsym_#{self.object_id.to_s(16)}_#{Time.now.to_i.to_s(16)}".to_sym) + end + + def test_integer_hash_random + assert_hash_random(0) + assert_hash_random(+1) + assert_hash_random(-1) + assert_hash_random(+(1<<100)) + assert_hash_random(-(1<<100)) + end + + def test_float_hash_random + assert_hash_random(0.0) + assert_hash_random(+1.0) + assert_hash_random(-1.0) + assert_hash_random(1.72723e-77) + assert_hash_random(Float::INFINITY, "Float::INFINITY") + end + def test_label_syntax return unless @cls == Hash diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 7ee7fa7e97..2bd35b1703 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -979,18 +979,6 @@ CODE assert_not_equal(S("sub-setter").hash, S("discover").hash, bug9172) end - def test_hash_random - str = 'abc' - a = [str.hash.to_s] - 3.times { - assert_in_out_err(["-e", "print #{str.dump}.hash"], "") do |r, e| - a += r - assert_equal([], e) - end - } - assert_not_equal([str.hash.to_s], a.uniq) - end - def test_hex assert_equal(255, S("0xff").hex) assert_equal(-255, S("-0xff").hex) |