hone	2013-12-23 08:31:03 +0900 (Mon, 23 Dec 2013)

  New Revision: 44351

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44351

  Log:
    merge revision(s) 43775: [Fixes GH-457]
    https://github.com/ruby/ruby/pull/457
    
        * util.c (ruby_strtod): ignore too long fraction part, which does not
          affect the result.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/util.c
    branches/ruby_1_8_7/version.h
Index: ruby_1_8_7/util.c
===================================================================
--- ruby_1_8_7/util.c	(revision 44350)
+++ ruby_1_8_7/util.c	(revision 44351)
@@ -892,6 +892,11 @@ extern void *MALLOC(size_t); https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/util.c#L892
 #else
 #define MALLOC malloc
 #endif
+#ifdef FREE
+extern void FREE(void*);
+#else
+#define FREE free
+#endif
 
 #ifndef Omit_Private_Memory
 #ifndef PRIVATE_MEM
@@ -1176,7 +1181,7 @@ Balloc(int k) https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/util.c#L1181
 #endif
 
     ACQUIRE_DTOA_LOCK(0);
-    if ((rv = freelist[k]) != 0) {
+    if (k <= Kmax && (rv = freelist[k]) != 0) {
         freelist[k] = rv->next;
     }
     else {
@@ -1186,7 +1191,7 @@ Balloc(int k) https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/util.c#L1191
 #else
         len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
                 /sizeof(double);
-        if (pmem_next - private_mem + len <= PRIVATE_mem) {
+        if (k <= Kmax && pmem_next - private_mem + len <= PRIVATE_mem) {
             rv = (Bigint*)pmem_next;
             pmem_next += len;
         }
@@ -1205,6 +1210,10 @@ static void https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/util.c#L1210
 Bfree(Bigint *v)
 {
     if (v) {
+        if (v->k > Kmax) {
+            FREE(v);
+            return;
+        }
         ACQUIRE_DTOA_LOCK(0);
         v->next = freelist[v->k];
         freelist[v->k] = v;
@@ -2200,6 +2209,7 @@ break2: https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/util.c#L2209
         for (; c >= '0' && c <= '9'; c = *++s) {
 have_dig:
             nz++;
+            if (nf > DBL_DIG * 2) continue;
             if (c -= '0') {
                 nf += nz;
                 for (i = 1; i < nz; i++)
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 44350)
+++ ruby_1_8_7/ChangeLog	(revision 44351)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/ChangeLog#L1
+Fri Nov 22 12:43:52 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* util.c (ruby_strtod): ignore too long fraction part, which does not
+	  affect the result.
+
 Thu Jun 27 20:55:23 2013  URABE Shyouhei  <shyouhei@r...>
 
 	* test/openssl/test_ssl.rb: Oops, sorry!
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 44350)
+++ ruby_1_8_7/version.h	(revision 44351)
@@ -1,15 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_8_7/version.h#L1
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2013-06-27"
+#define RUBY_RELEASE_DATE "2013-12-22"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20130627
-#define RUBY_PATCHLEVEL 374
+#define RUBY_RELEASE_CODE 20131222
+#define RUBY_PATCHLEVEL 375
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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