From fc64f8c5fe0bdbd69b2b55bfb8d1ade653714f53 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 3 Jul 2008 17:22:29 +0000 Subject: * numeric.c (check_uint, rb_num2uint): also needs checking negative value. see [ruby-dev:33683] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index ec68f2b348..96c492ee3c 100644 --- a/numeric.c +++ b/numeric.c @@ -1585,10 +1585,10 @@ check_int(SIGNED_VALUE num) } static void -check_uint(VALUE num) +check_uint(VALUE num, int sign) { if (num > UINT_MAX) { - rb_raise(rb_eRangeError, "integer %"PRIuVALUE " too big to convert to `unsigned int'", num); + rb_raise(rb_eRangeError, "integer %"PRIuVALUE " too %s to convert to `unsigned int'", num, sign ? "small" : "big"); } } @@ -1615,9 +1615,7 @@ rb_num2uint(VALUE val) { unsigned long num = rb_num2ulong(val); - if (RTEST(rb_funcall(INT2FIX(0), '<', 1, val))) { - check_uint(num); - } + check_uint(num, RTEST(rb_funcall(val, '<', INT2FIX(0)))); return num; } @@ -1630,9 +1628,7 @@ rb_fix2uint(VALUE val) return rb_num2uint(val); } num = FIX2ULONG(val); - if (FIX2LONG(val) > 0) { - check_uint(num); - } + check_uint(num, RTEST(rb_funcall(val, '<', INT2FIX(0)))); return num; } #else -- cgit v1.2.3