From 75d3a3d0dfac771054346519c588112b43a6f4bc Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 4 Jul 2008 08:52:51 +0000 Subject: * numeric.c (check_uint, rb_num2uint, rb_fix2uint): proper check. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index 07b5ae6e46..83f1d3c438 100644 --- a/numeric.c +++ b/numeric.c @@ -1585,10 +1585,10 @@ check_int(SIGNED_VALUE num) } static void -check_uint(VALUE num, int sign) +check_uint(VALUE num) { if (num > UINT_MAX) { - rb_raise(rb_eRangeError, "integer %"PRIuVALUE " 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); } } @@ -1615,7 +1615,10 @@ rb_num2uint(VALUE 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; } @@ -1628,7 +1631,10 @@ rb_fix2uint(VALUE 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 -- cgit v1.2.3