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

merge revision(s) 18100,18129:

Browse source 
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
	  fixed [ruby-dev:33683]
	* 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_7@18331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-08-04 04:36:00 +00:00
parent d1911459ae
commit 3fcb394972
3 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Mon Aug 4 13:31:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
about 64bit positive value.
Mon Aug 4 13:31:41 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
fixed [ruby-dev:33683]
Thu Jul 17 21:42:07 2008 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821

25
numeric.c
View file

@ -1600,11 +1600,21 @@ check_int(num)
}
static void
check_uint(num)
check_uint(num, sign)
unsigned long num;
VALUE sign;
{
if (num > UINT_MAX) {
rb_raise(rb_eRangeError, "integer %lu too big to convert to `unsigned int'", num);
static const unsigned long mask = ~(unsigned long)UINT_MAX;
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);
}
}
@ -1634,9 +1644,7 @@ rb_num2uint(val)
{
unsigned long num = rb_num2ulong(val);
if (RTEST(rb_funcall(INT2FIX(0), '<', 1, val))) {
check_uint(num);
}
check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num;
}
@ -1650,9 +1658,8 @@ rb_fix2uint(val)
return rb_num2uint(val);
}
num = FIX2ULONG(val);
if (FIX2LONG(val) > 0) {
check_uint(num);
}
check_uint(num, rb_funcall(val, '<', 1, INT2FIX(0)));
return num;
}
#else

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-08-04"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080804
#define RUBY_PATCHLEVEL 64
#define RUBY_PATCHLEVEL 65
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8