1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* numeric.c (check_uint, rb_num2uint): also needs checking negative

Browse Source 
value. see [ruby-dev:33683]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-07-03 17:22:29 +00:00
parent 3643afcc45
commit fc64f8c5fe
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jul 4 02:21:06 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint): also needs checking negative
value. see [ruby-dev:33683]
Thu Jul 3 23:26:36 2008 Yusuke Endoh <mame@tsg.ne.jp> Thu Jul 3 23:26:36 2008 Yusuke Endoh <mame@tsg.ne.jp>
* include/ruby/intern.h: remove prototypes about coverage. * include/ruby/intern.h: remove prototypes about coverage.

12
numeric.c
View File

@ -1585,10 +1585,10 @@ check_int(SIGNED_VALUE num)
} }
static void static void
check_uint(VALUE num) check_uint(VALUE num, int sign)
{ {
if (num > UINT_MAX) { 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); unsigned long num = rb_num2ulong(val);
if (RTEST(rb_funcall(INT2FIX(0), '<', 1, val))) { check_uint(num, RTEST(rb_funcall(val, '<', INT2FIX(0))));
check_uint(num);
}
return num; return num;
} }
@ -1630,9 +1628,7 @@ rb_fix2uint(VALUE val)
return rb_num2uint(val); return rb_num2uint(val);
} }
num = FIX2ULONG(val); num = FIX2ULONG(val);
if (FIX2LONG(val) > 0) { check_uint(num, RTEST(rb_funcall(val, '<', INT2FIX(0))));
check_uint(num);
}
return num; return num;
} }
#else #else