From c71b916f37c5dc0c0202b4410af2c3dc1c740bb9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 10:54:01 +0000 Subject: merge revision(s) 15645:15647: * bignum.c (big2str_find_n1): check integer overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bignum.c | 3 +++ test/ruby/test_bignum.rb | 8 ++++++++ version.h | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2922c07cf0..6bb10d1b36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 15 19:53:16 2008 Nobuyoshi Nakada + + * bignum.c (big2str_find_n1): check integer overflow. + Sun Jun 15 19:51:37 2008 Tanaka Akira * gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed. [ruby-dev:33857] diff --git a/bignum.c b/bignum.c index cf7649c47e..80ab1c936b 100644 --- a/bignum.c +++ b/bignum.c @@ -636,6 +636,9 @@ rb_big2str(x, base) if (BIGZEROP(x)) { return rb_str_new2("0"); } + if (i >= LONG_MAX/SIZEOF_BDIGITS/CHAR_BIT) { + rb_raise(rb_eRangeError, "bignum too big to convert into `string'"); + } j = SIZEOF_BDIGITS*CHAR_BIT*i; switch (base) { case 2: break; diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb index c238337db5..e070a9c866 100644 --- a/test/ruby/test_bignum.rb +++ b/test/ruby/test_bignum.rb @@ -84,4 +84,12 @@ class TestBignum < Test::Unit::TestCase shift_test(-4518325415524767873) shift_test(-0xfffffffffffffffff) end + + def test_too_big_to_s + if (big = 2**31-1).is_a?(Fixnum) + return + end + e = assert_raise(RangeError) {(1 << big).to_s} + assert_match(/too big to convert/, e.message) + end end diff --git a/version.h b/version.h index 9a31e9a43b..96dcbc131a 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 182 +#define RUBY_PATCHLEVEL 183 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.1