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

Sat Jul 19 00:27:58 2008 NAKAMURA Usaku <usa@ruby-lang.org>

Browse source 
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
	  about 64bit positive value.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-07-18 15:41:47 +00:00
parent fda0d27347
commit 61a2d6baf3
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
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.
Thu Jul 17 10:32:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.

25
numeric.c
View file

@ -1600,20 +1600,21 @@ check_int(num)
}
static void
check_uint(num)
check_uint(num, sign)
unsigned long num;
VALUE sign;
{
static const unsigned long mask = ~(unsigned long)UINT_MAX;
static const unsigned long msb = ~LONG_MAX;
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 %ld too %s to convert to `unsigned int'", num, s);
if (RTEST(sign)) {
/* minus */
if ((num & mask) != mask || (num & ~mask) <= INT_MAX + 1UL)
rb_raise(rb_eRangeError, "integer %ld too small to convert to `unsigned int'", num);
}
else {
/* plus */
if ((num & mask) != 0)
rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num);
}
}
@ -1643,7 +1644,7 @@ rb_num2uint(val)
{
unsigned long num = rb_num2ulong(val);
check_uint(num);
check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num;
}
@ -1658,7 +1659,7 @@ rb_fix2uint(val)
}
num = FIX2ULONG(val);
check_uint(num);
check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num;
}
#else