usa	2008-07-17 10:23:35 +0900 (Thu, 17 Jul 2008)

  New Revision: 18099

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

  Log:
    * numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
      fixed [ruby-dev:33683]

  Modified files:
    trunk/ChangeLog
    trunk/numeric.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18098)
+++ ChangeLog	(revision 18099)
@@ -1,3 +1,8 @@
+Thu Jul 17 10:21:15 2008  NAKAMURA Usaku  <usa@r...>
+
+	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
+	  fixed [ruby-dev:33683]
+
 Thu Jul 17 04:19:33 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (thread_start_func_2): wake up joining threads.
Index: numeric.c
===================================================================
--- numeric.c	(revision 18098)
+++ numeric.c	(revision 18099)
@@ -1587,8 +1587,22 @@
 static void
 check_uint(VALUE num)
 {
-    if (num > UINT_MAX) {
-	rb_raise(rb_eRangeError, "integer %"PRIuVALUE " too big to convert to `unsigned int'", num);
+    static const VALUE mask = ~(VALUE)UINT_MAX;
+    static const VALUE msb =
+#if SIZEOF_LONG == SIZEOF_VALUE
+	~LONG_MAX;
+#elif SIZEOF_LONG_LONG == SIZEOF_VALUE
+	~LLONG_MAX;
+#endif
+    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 %"PRIdVALUE " too %s to convert to `unsigned int'", num, s);
     }
 }
 
@@ -1615,10 +1629,7 @@
 {
     unsigned long num = rb_num2ulong(val);
 
-    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0))))
-	check_int(num);
-    else
-	check_uint(num);
+    check_uint(num);
     return num;
 }
 
@@ -1631,10 +1642,8 @@
 	return rb_num2uint(val);
     }
     num = FIX2ULONG(val);
-    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0))))
-	check_int(num);
-    else
-	check_uint(num);
+
+    check_uint(num);
     return num;
 }
 #else

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