diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | numeric.c | 14 | ||||
| -rw-r--r-- | test/ruby/test_numeric.rb | 6 |
3 files changed, 17 insertions, 8 deletions
@@ -4,6 +4,11 @@ Wed May 7 20:19:18 2008 NAKAMURA Usaku <usa@ruby-lang.org> after Init_prelude() because cannot load encoding extensions before it. +Wed May 7 20:00:21 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * numeric.c (bit_coerce): float should not be a valid operand of + bitwise operations. [ruby-dev:34583] + Wed May 7 19:35:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * thread.c (rb_thread_key_p): should always convert symbol to ID. @@ -2636,9 +2636,12 @@ fix_rev(VALUE num) } static VALUE -fix_coerce(VALUE x) +bit_coerce(VALUE x) { while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) { + if (TYPE(x) == T_FLOAT) { + rb_raise(rb_eTypeError, "can't convert Float into Integer"); + } x = rb_to_int(x); } return x; @@ -2656,7 +2659,7 @@ fix_and(VALUE x, VALUE y) { long val; - if (!FIXNUM_P(y = fix_coerce(y))) { + if (!FIXNUM_P(y = bit_coerce(y))) { return rb_big_and(y, x); } val = FIX2LONG(x) & FIX2LONG(y); @@ -2675,7 +2678,7 @@ fix_or(VALUE x, VALUE y) { long val; - if (!FIXNUM_P(y = fix_coerce(y))) { + if (!FIXNUM_P(y = bit_coerce(y))) { return rb_big_or(y, x); } val = FIX2LONG(x) | FIX2LONG(y); @@ -2694,7 +2697,7 @@ fix_xor(VALUE x, VALUE y) { long val; - if (!FIXNUM_P(y = fix_coerce(y))) { + if (!FIXNUM_P(y = bit_coerce(y))) { return rb_big_xor(y, x); } val = FIX2LONG(x) ^ FIX2LONG(y); @@ -2791,7 +2794,8 @@ fix_aref(VALUE fix, VALUE idx) long val = FIX2LONG(fix); long i; - if (!FIXNUM_P(idx = fix_coerce(idx))) { + idx = rb_to_int(idx); + if (!FIXNUM_P(idx)) { idx = rb_big_norm(idx); if (!FIXNUM_P(idx)) { if (!RBIGNUM_SIGN(idx) || val >= 0) diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb index 584139a7f8..b1edb8fe47 100644 --- a/test/ruby/test_numeric.rb +++ b/test/ruby/test_numeric.rb @@ -201,9 +201,9 @@ class TestNumeric < Test::Unit::TestCase def test_num2long assert_raise(TypeError) { 1 & nil } - assert_equal(1, 1 & 1.0) - assert_equal(0, 1 & 2147483648.0) - assert_equal(0, 1 & 9223372036854777856.0) + assert_raise(TypeError) { 1 & 1.0 } + assert_raise(TypeError) { 1 & 2147483648.0 } + assert_raise(TypeError) { 1 & 9223372036854777856.0 } o = Object.new def o.to_int; 1; end assert_equal(1, 1 & o) |