kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.

Browse source 
fixed [ruby-dev:33683]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-07-17 01:23:35 +00:00
parent c60b57ade0
commit 6852eaaf0d
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jul 17 10:21:15 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
fixed [ruby-dev:33683]
Thu Jul 17 04:19:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 17 04:19:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (thread_start_func_2): wake up joining threads. * thread.c (thread_start_func_2): wake up joining threads.

25
numeric.c
View file

@ -1587,8 +1587,22 @@ check_int(SIGNED_VALUE num)
static void static void
check_uint(VALUE num) check_uint(VALUE num)
{ {
if (num > UINT_MAX) { static const VALUE mask = ~(VALUE)UINT_MAX;
rb_raise(rb_eRangeError, "integer %"PRIuVALUE " too big to convert to `unsigned int'", num); static const VALUE msb =
#if SIZEOF_LONG == SIZEOF_VALUE
~LONG_MAX;
#elif SIZEOF_LONG_LONG == SIZEOF_VALUE
~LLONG_MAX;
#endif
const char *s;
if ((num & mask) != 0 &&
((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)) {
if ((num & msb) == 0)
s = "big";
else
s = "small";
rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `unsigned int'", num, s);
} }
} }
@ -1615,9 +1629,6 @@ rb_num2uint(VALUE val)
{ {
unsigned long num = rb_num2ulong(val); unsigned long num = rb_num2ulong(val);
if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0))))
check_int(num);
else
check_uint(num); check_uint(num);
return num; return num;
} }
@ -1631,9 +1642,7 @@ rb_fix2uint(VALUE val)
return rb_num2uint(val); return rb_num2uint(val);
} }
num = FIX2ULONG(val); num = FIX2ULONG(val);
if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0))))
check_int(num);
else
check_uint(num); check_uint(num);
return num; return num;
} }