merge revision(s) 17074:

	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5823c555bf..a012b19a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 17:07:30 2008  wanabe  <s.wanabe@gmail.com>
+
+	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
+	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
+
 Sun Jun 29 16:56:57 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (Set#delete_if): Call to_a.
diff --git a/util.c b/util.c
index 34a9fe731a..af6e689d0a 100644
--- a/util.c
+++ b/util.c
@@ -2165,6 +2165,8 @@ break2:
     }
 #endif
     if (c == '.') {
+        if (!ISDIGIT(s[1]))
+            goto dig_done;
         c = *++s;
         if (!nd) {
             for (; c == '0'; c = *++s)
diff --git a/version.h b/version.h
index 40b6c13db1..eacb3802ae 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-29"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8