diff --git a/ChangeLog b/ChangeLog index 004c362ea8..e18f0af513 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 22 12:43:52 2013 Nobuyoshi Nakada + + * util.c (ruby_strtod): ignore too long fraction part, which does not + affect the result. + Mon Apr 15 14:57:43 2013 NARUSE, Yui * ext/json/parser/parser.rl (json_string_unescape): workaround fix diff --git a/util.c b/util.c index 26f46baf00..c75ad74032 100644 --- a/util.c +++ b/util.c @@ -852,6 +852,11 @@ extern void *MALLOC(size_t); #else #define MALLOC malloc #endif +#ifdef FREE +extern void FREE(void*); +#else +#define FREE free +#endif #ifndef Omit_Private_Memory #ifndef PRIVATE_MEM @@ -1142,7 +1147,7 @@ Balloc(int k) #endif ACQUIRE_DTOA_LOCK(0); - if ((rv = freelist[k]) != 0) { + if (k <= Kmax && (rv = freelist[k]) != 0) { freelist[k] = rv->next; } else { @@ -1152,7 +1157,7 @@ Balloc(int k) #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; } @@ -1171,6 +1176,10 @@ static void 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; @@ -2212,6 +2221,7 @@ break2: 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++) diff --git a/version.h b/version.h index 84645eee00..e7443a1411 100644 --- a/version.h +++ b/version.h @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 325 +#define RUBY_PATCHLEVEL 326 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2013 -#define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 15 -#define RUBY_RELEASE_DATE "2013-04-15" +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DATE "2013-12-23" #include "ruby/version.h"