diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | numeric.c | 29 |
2 files changed, 24 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Thu Jul 17 10:21:15 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check. + fixed [ruby-dev:33683] + Thu Jul 17 04:19:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread.c (thread_start_func_2): wake up joining threads. @@ -1587,8 +1587,22 @@ check_int(SIGNED_VALUE num) 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 @@ rb_num2uint(VALUE val) { 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 @@ rb_fix2uint(VALUE val) 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 |