usa	2008-07-19 00:41:47 +0900 (Sat, 19 Jul 2008)

  New Revision: 18129

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18129

  Log:
    Sat Jul 19 00:27:58 2008  NAKAMURA Usaku  <usa@r...>
    
    * numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
      about 64bit positive value.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/numeric.c

Index: ruby_1_8/numeric.c
===================================================================
--- ruby_1_8/numeric.c	(revision 18128)
+++ ruby_1_8/numeric.c	(revision 18129)
@@ -1600,21 +1600,22 @@
 }
 
 static void
-check_uint(num)
+check_uint(num, sign)
     unsigned long num;
+    VALUE sign;
 {
     static const unsigned long mask = ~(unsigned long)UINT_MAX;
-    static const unsigned long msb = ~LONG_MAX;
-    const char *s;
 
-    if ((num & mask) != 0 &&
-	((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)) {
-	if ((num & msb) == 0)
-	    s = "big";
-	else
-	    s = "small";
-	rb_raise(rb_eRangeError, "integer %ld too %s to convert to `unsigned int'", num, s);
+    if (RTEST(sign)) {
+	/* minus */
+	if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)
+	    rb_raise(rb_eRangeError, "integer %ld too small to convert to `unsigned int'", num);
     }
+    else {
+	/* plus */
+	if ((num & mask) != 0)
+	    rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num);
+    }
 }
 
 long
@@ -1643,7 +1644,7 @@
 {
     unsigned long num = rb_num2ulong(val);
 
-    check_uint(num);
+    check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
     return num;
 }
 
@@ -1658,7 +1659,7 @@
     }
     num = FIX2ULONG(val);
 
-    check_uint(num);
+    check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
     return num;
 }
 #else
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18128)
+++ ruby_1_8/ChangeLog	(revision 18129)
@@ -1,3 +1,7 @@
+Sat Jul 19 00:27:58 2008  NAKAMURA Usaku  <usa@r...>
+
+	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
+	  about 64bit positive value.
 Thu Jul 17 10:32:40 2008  NAKAMURA Usaku  <usa@r...>
 
 	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/