diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_float.rb | 6 | ||||
-rw-r--r-- | util.c | 14 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 26 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Fri Nov 22 12:46:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * util.c (ruby_strtod): ignore too long fraction part, which does not + affect the result. + Wed Nov 20 15:20:00 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * test/ruby/test_thread.rb (test_mutex_unlock_on_trap): extend waiting diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index f011c2b062..e9b18f2e57 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -613,4 +613,10 @@ class TestFloat < Test::Unit::TestCase # always not flonum assert_raise(TypeError) { a = Float::INFINITY; def a.foo; end } end + + def test_long_string + assert_separately([], <<-'end;') + assert_in_epsilon(10.0, ("1."+"1"*300000).to_f*9) + end; + end end @@ -715,6 +715,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 @@ -1005,7 +1010,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 { @@ -1015,7 +1020,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; } @@ -1034,6 +1039,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; @@ -2097,6 +2106,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++) @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-11-21" -#define RUBY_PATCHLEVEL 351 +#define RUBY_RELEASE_DATE "2013-11-22" +#define RUBY_PATCHLEVEL 352 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" |