From d771eb69027f2827c2f3f3edee5dd2c1a9678bc8 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 May 2008 13:24:55 +0000
Subject: * numeric.c (bit_coerce): float should not be a valid operand of  
 bitwise operations.  [ruby-dev:34583]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 numeric.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'numeric.c')

diff --git a/numeric.c b/numeric.c
index 775f392e5..999c970a9 100644
--- a/numeric.c
+++ b/numeric.c
@@ -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)
-- 
cgit