From 3fcb3949720e406e543c6e7fcf8ac33d5837e859 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 4 Aug 2008 04:36:00 +0000 Subject: merge revision(s) 18100,18129: * numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check. fixed [ruby-dev:33683] * numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check about 64bit positive value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index b7b60982a7..4f181035ae 100644 --- a/numeric.c +++ b/numeric.c @@ -1600,11 +1600,21 @@ check_int(num) } static void -check_uint(num) +check_uint(num, sign) unsigned long num; + VALUE sign; { - if (num > UINT_MAX) { - rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num); + static const unsigned long mask = ~(unsigned long)UINT_MAX; + + 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); } } @@ -1634,9 +1644,7 @@ rb_num2uint(val) { unsigned long num = rb_num2ulong(val); - if (RTEST(rb_funcall(INT2FIX(0), '<', 1, val))) { - check_uint(num); - } + check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0))); return num; } @@ -1650,9 +1658,8 @@ rb_fix2uint(val) return rb_num2uint(val); } num = FIX2ULONG(val); - if (FIX2LONG(val) > 0) { - check_uint(num); - } + + check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0))); return num; } #else -- cgit v1.2.3