merge revision(s) 14095:

shyouhei · shyouhei · commit a2eab05d610a · 2008-06-07T20:03:32.000Z
* 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
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  8 05:02:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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  <nobu@ruby-lang.org>
 
 	* eval.c (error_print): put newline unless multiple line message ends
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ rb_cstr_to_inum(str, base, badcheck)`
`446`	`446`	`}`
`447`	`447`	`if (str == '0') { / squeeze preceeding 0s */`
`448`	`448`	`while (*++str == '0');`
`449`		`- if (!*str) --str;`
	`449`	`+ if (!(c = *str) \|\| ISSPACE(c)) --str;`
`450`	`450`	`}`
`451`	`451`	`c = *str;`
`452`	`452`	`c = conv_digit(c);`