usa	2019-01-31 19:47:59 +0900 (Thu, 31 Jan 2019)

  New Revision: 66962

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66962

  Log:
    merge revision(s) 63334: [Backport #14729]
    
    object.c: raise on long invalid float string
    
    * object.c (rb_cstr_to_dbl_raise): check long invalid float
      string more precisely when truncating insignificant part.
      [ruby-core:86800] [Bug #14729]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/object.c
    branches/ruby_2_4/test/ruby/test_float.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 66961)
+++ ruby_2_4/version.h	(revision 66962)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.6"
 #define RUBY_RELEASE_DATE "2019-01-31"
-#define RUBY_PATCHLEVEL 337
+#define RUBY_PATCHLEVEL 338
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_4/test/ruby/test_float.rb
===================================================================
--- ruby_2_4/test/ruby/test_float.rb	(revision 66961)
+++ ruby_2_4/test/ruby/test_float.rb	(revision 66962)
@@ -163,6 +163,12 @@ class TestFloat < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_float.rb#L163
       assert_equal(-31.0*2**-1027, Float("-0x1f"+("0"*268)+".0p-2099"))
       assert_equal(-31.0*2**-1027, Float("-0x1f"+("0"*600)+".0p-3427"))
     end
+
+    z = "0" * (Float::DIG * 4 + 10)
+    ["long invalid string", "1.0", "1.0e", "1.0e-", "1.0e+"].each do |n|
+      assert_raise(ArgumentError, n += z + "A") {Float(n)}
+      assert_raise(ArgumentError, n += z + ".0") {Float(n)}
+    end
   end
 
   def test_divmod
Index: ruby_2_4/object.c
===================================================================
--- ruby_2_4/object.c	(revision 66961)
+++ ruby_2_4/object.c	(revision 66962)
@@ -2816,30 +2816,53 @@ rb_cstr_to_dbl(const char *p, int badche https://github.com/ruby/ruby/blob/trunk/ruby_2_4/object.c#L2816
 	return d;
     }
     if (*end) {
-	char buf[DBL_DIG * 4 + 10];
-	char *n = buf;
-	char *e = buf + sizeof(buf) - 1;
-	char prev = 0;
+        char buf[DBL_DIG * 4 + 10];
+        char *n = buf;
+        char *const init_e = buf + DBL_DIG * 4;
+        char *e = init_e;
+        char prev = 0;
+        int dot_seen = FALSE;
 
-	while (p < end && n < e) prev = *n++ = *p++;
-	while (*p) {
-	    if (*p == '_') {
-		/* remove underscores between digits */
-		if (badcheck) {
-		    if (n == buf || !ISDIGIT(prev)) goto bad;
-		    ++p;
-		    if (!ISDIGIT(*p)) goto bad;
-		}
-		else {
-		    while (*++p == '_');
-		    continue;
-		}
-	    }
-	    prev = *p++;
-	    if (n < e) *n++ = prev;
-	}
-	*n = '\0';
-	p = buf;
+        switch (*p) {case '+': case '-': prev = *n++ = *p++;}
+        if (*p == '0') {
+            prev = *n++ = '0';
+            while (*++p == '0');
+        }
+        while (p < end && n < e) prev = *n++ = *p++;
+        while (*p) {
+            if (*p == '_') {
+                /* remove an underscore between digits */
+                if (n == buf || !ISDIGIT(prev) || (++p, !ISDIGIT(*p))) {
+                    if (badcheck) goto bad;
+                    break;
+                }
+            }
+            prev = *p++;
+            if (e == init_e && (prev == 'e' || prev == 'E' || prev == 'p' || prev == 'P')) {
+                e = buf + sizeof(buf) - 1;
+                *n++ = prev;
+                switch (*p) {case '+': case '-': prev = *n++ = *p++;}
+                if (*p == '0') {
+                    prev = *n++ = '0';
+                    while (*++p == '0');
+                }
+                continue;
+            }
+            else if (ISSPACE(prev)) {
+                while (ISSPACE(*p)) ++p;
+                if (*p) {
+                    if (badcheck) goto bad;
+                    break;
+                }
+            }
+            else if (prev == '.' ? dot_seen++ : !ISDIGIT(prev)) {
+                if (badcheck) goto bad;
+                break;
+            }
+            if (n < e) *n++ = prev;
+        }
+        *n = '\0';
+        p = buf;
 
 	if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
 	    return 0.0;
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 66961)
+++ ruby_2_4	(revision 66962)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r63334

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