shyouhei	2008-06-29 17:08:14 +0900 (Sun, 29 Jun 2008)

  New Revision: 17650

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/util.c
    branches/ruby_1_8_6/version.h

  Log:
    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]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17650&r2=17649&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17650&r2=17649&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/util.c?r1=17650&r2=17649&diff_format=u

Index: ruby_1_8_6/util.c
===================================================================
--- ruby_1_8_6/util.c	(revision 17649)
+++ ruby_1_8_6/util.c	(revision 17650)
@@ -2165,6 +2165,8 @@
     }
 #endif
     if (c == '.') {
+        if (!ISDIGIT(s[1]))
+            goto dig_done;
         c = *++s;
         if (!nd) {
             for (; c == '0'; c = *++s)
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17649)
+++ ruby_1_8_6/ChangeLog	(revision 17650)
@@ -1,3 +1,8 @@
+Sun Jun 29 17:07:30 2008  wanabe  <s.wanabe@g...>
+
+	* 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@i...>
 
 	* lib/set.rb (Set#delete_if): Call to_a.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17649)
+++ ruby_1_8_6/version.h	(revision 17650)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/