diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | hash.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 1 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Jul 29 14:53:32 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (rb_any_hash): fix Float hash. rb_dbl_hash() returns a + Fixnum, but not a long. [Bug #9381] + Wed Jul 29 11:07:10 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * internal.h (LIKELY, UNLIKELY): make a boolean to enforce 1 or 0. @@ -142,7 +142,7 @@ rb_any_hash(VALUE a) } else if (FLONUM_P(a)) { /* prevent pathological behavior: [Bug #10761] */ - return rb_dbl_hash(rb_float_value(a)); + goto flt; } hnum = rb_objid_hash((st_index_t)a); } @@ -153,7 +153,9 @@ rb_any_hash(VALUE a) return RSYMBOL(a)->hashval; } else if (BUILTIN_TYPE(a) == T_FLOAT) { - return rb_dbl_hash(rb_float_value(a)); + flt: + hval = rb_dbl_hash(rb_float_value(a)); + hnum = FIX2LONG(hval); } else { hval = rb_hash(a); diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 688dc8689a..d4837ca6cf 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1281,6 +1281,7 @@ class TestHash < Test::Unit::TestCase bad = [ 5, true, false, nil, + 0.0, 1.72723e-77, ].select do |x| hash = {x => bug9381} hash[wrapper.new(x)] != bug9381 |