From 80644b31d5fa315bfe2ef73456557a9c985f88bd Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 4 Dec 2007 02:23:52 +0000 Subject: * bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing preceeding 0s. [ruby-core:13873] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bignum.c | 2 +- test/ruby/test_integer.rb | 3 +++ version.h | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93e74d7f1e..ef4f807d03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 4 11:23:50 2007 Nobuyoshi Nakada + + * bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing + preceeding 0s. [ruby-core:13873] + Mon Dec 3 11:51:53 2007 NAKAMURA Usaku * ext/Win32API/*: removed or moved to ext/dl/win32. diff --git a/bignum.c b/bignum.c index dd6d7b134c..624a4e5964 100644 --- a/bignum.c +++ b/bignum.c @@ -472,7 +472,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) } if (*str == '0') { /* squeeze preceeding 0s */ while (*++str == '0'); - if (!*str) --str; + if (!(c = *str) || ISSPACE(c)) --str; } c = *str; c = conv_digit(c); diff --git a/test/ruby/test_integer.rb b/test/ruby/test_integer.rb index e6fd3e5521..81f8c65797 100644 --- a/test/ruby/test_integer.rb +++ b/test/ruby/test_integer.rb @@ -667,5 +667,8 @@ class TestInteger < Test::Unit::TestCase assert_raise(ArgumentError) { Integer("4611686018427387904 :") } assert_equal(0x4000000000000000, Integer("46_11_686_0184273_87904")) assert_raise(ArgumentError) { Integer("\0") } + assert_nothing_raised(ArgumentError, "[ruby-core:13873]") { + assert_equal(0, Integer("0 ")) + } end end diff --git a/version.h b/version.h index 4fca23e567..54700f5549 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-12-03" +#define RUBY_RELEASE_DATE "2007-12-04" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071203 +#define RUBY_RELEASE_CODE 20071204 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 4 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3