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): fixed wrong check

Browse source 
about 64bit positive value.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-07-18 15:29:17 +00:00
parent 305b347ae5
commit 404d0ad40f
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Jul 19 00:27:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
about 64bit positive value.
Fri Jul 18 23:23:37 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> Fri Jul 18 23:23:37 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (EVENTSINK_Invoke): avoid cfp consistency * ext/win32ole/win32ole.c (EVENTSINK_Invoke): avoid cfp consistency

29
numeric.c
View file

@ -1585,25 +1585,26 @@ check_int(SIGNED_VALUE num)
} }
static void static void
check_uint(VALUE num) check_uint(VALUE num, VALUE sign)
{ {
static const VALUE mask = ~(VALUE)UINT_MAX; static const VALUE mask = ~(VALUE)UINT_MAX;
static const VALUE msb =
#if SIZEOF_LONG == SIZEOF_VALUE
~LONG_MAX;
#elif SIZEOF_LONG_LONG == SIZEOF_VALUE
~LLONG_MAX;
#endif
const char *s; const char *s;
if ((num & mask) != 0 && if (RTEST(sign)) {
((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)) { /* minus */
if ((num & msb) == 0) if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)
s = "small";
else
return;
}
else {
/* plus */
if ((num & mask) != 0)
s = "big"; s = "big";
else else
s = "small"; return;
rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `unsigned int'", num, s);
} }
rb_raise(rb_eRangeError, "integer %"PRIdVALUE " too %s to convert to `unsigned int'", num, s);
} }
long long
@ -1629,7 +1630,7 @@ rb_num2uint(VALUE val)
{ {
unsigned long num = rb_num2ulong(val); unsigned long num = rb_num2ulong(val);
check_uint(num); check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num; return num;
} }
@ -1643,7 +1644,7 @@ rb_fix2uint(VALUE val)
} }
num = FIX2ULONG(val); num = FIX2ULONG(val);
check_uint(num); check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num; return num;
} }
#else #else