diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | numeric.c | 15 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Fri Jul 4 17:53:29 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * numeric.c (check_uint, rb_num2uint, rb_fix2uint): proper check. + Fri Jul 4 14:17:22 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/net/ftp.rb (Net::FTP#sendport): use divmod. [ruby-core:17557] @@ -1600,12 +1600,11 @@ check_int(num) } static void -check_uint(num, sign) +check_uint(num) unsigned long num; - int sign; { if (num > UINT_MAX) { - rb_raise(rb_eRangeError, "integer %lu too %s to convert to `unsigned int'", num, sign ? "small" : "big"); + rb_raise(rb_eRangeError, "integer %"PRIuVALUE " too big to convert to `unsigned int'", num); } } @@ -1635,7 +1634,10 @@ rb_num2uint(val) { unsigned long num = rb_num2ulong(val); - check_uint(num, RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))); + if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) + check_int(num); + else + check_uint(num); return num; } @@ -1649,7 +1651,10 @@ rb_fix2uint(val) return rb_num2uint(val); } num = FIX2ULONG(val); - check_uint(num, RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))); + if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) + check_int(num); + else + check_uint(num); return num; } #else |