diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | hash.c | 6 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 10 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Fri Aug 14 15:24:12 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] + Fri Aug 14 15:09:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/json/parser/parser.rl: raise with messages in UTF-8 @@ -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) hnum = rb_objid_hash((st_index_t)a); } 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 86305ee958..1bb32f663e 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1264,8 +1264,14 @@ class TestHash < Test::Unit::TestCase end end - hash = {5 => bug9381} - assert_equal(bug9381, hash[wrapper.new(5)]) + bad = [ + 5, true, false, nil, + 0.0, 1.72723e-77, + ].select do |x| + hash = {x => bug9381} + hash[wrapper.new(x)] != bug9381 + end + assert_empty(bad, bug9381) end def test_label_syntax @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-08-14" -#define RUBY_PATCHLEVEL 165 +#define RUBY_PATCHLEVEL 166 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 8 |