From a2eab05d610a39d462eaeef10d03799b2637e68d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 20:03:32 +0000 Subject: merge revision(s) 14095: * 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/branches/ruby_1_8_6@16974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ bignum.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25c34fc532..ec4323f574 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 8 05:02:25 2008 Nobuyoshi Nakada + + * bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing + preceeding 0s. [ruby-core:13873] + Sun Jun 8 04:58:05 2008 Nobuyoshi Nakada * eval.c (error_print): put newline unless multiple line message ends diff --git a/bignum.c b/bignum.c index 25ca9be87e..9a5b3c154a 100644 --- a/bignum.c +++ b/bignum.c @@ -446,7 +446,7 @@ rb_cstr_to_inum(str, base, 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/version.h b/version.h index 76518a6163..f0b71b37d4 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 155 +#define RUBY_PATCHLEVEL 156 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3