diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | pack.c | 6 | ||||
-rw-r--r-- | test/ruby/test_float.rb | 1 | ||||
-rw-r--r-- | test/ruby/test_pack.rb | 3 | ||||
-rw-r--r-- | util.c | 12 |
5 files changed, 26 insertions, 6 deletions
@@ -1,3 +1,13 @@ +Fri Feb 17 11:20:53 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330] + + * pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4. + [ruby-talk:180024] + + * pack.c (pack_unpack): fixed integer overflow on template "w". + [ruby-talk:180126] + Fri Feb 17 09:39:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_thread_wait_for): sleep should always sleep for @@ -345,11 +345,11 @@ num2i32(VALUE x) return 0; /* not reached */ } -#if SIZEOF_LONG == SIZE32 || SIZEOF_INT == SIZE32 +#if SIZEOF_LONG == SIZE32 # define EXTEND32(x) #else /* invariant in modulo 1<<31 */ -# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31));}} while(0) +# define EXTEND32(x) do { if (!natint) {(x) = (((1L<<31)-1-(x))^~(~0L<<31));}} while(0) #endif #if SIZEOF_SHORT == SIZE16 # define EXTEND16(x) @@ -1937,7 +1937,7 @@ pack_unpack(VALUE str, VALUE fmt) case 'w': { unsigned long ul = 0; - unsigned long ulmask = 0xfeL << ((sizeof(unsigned long) - 1) * 8); + unsigned long ulmask = 0xfeUL << ((sizeof(unsigned long) - 1) * 8); while (len > 0 && s < send) { ul <<= 7; diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb index fb180ff81b..63979b5be0 100644 --- a/test/ruby/test_float.rb +++ b/test/ruby/test_float.rb @@ -84,6 +84,7 @@ class TestFloat < Test::Unit::TestCase assert_raise(ArgumentError){Float("+.")} assert_raise(ArgumentError){Float("-")} assert_raise(ArgumentError){Float("-.")} + assert_raise(ArgumentError){Float("1e")} # add expected behaviour here. end end diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index a9f15599e4..e67465b33a 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -15,6 +15,9 @@ class TestPack < Test::Unit::TestCase $x = [-1073741825] assert_equal($x, $x.pack("q").unpack("q")) + + $x = [-1] + assert_equal($x, $x.pack("l").unpack("l")) end def test_pack_N @@ -848,9 +848,15 @@ ruby_strtod( } expSign = FALSE; } - while (ISDIGIT(*p)) { - exp = exp * 10 + (*p - '0'); - p += 1; + if (ISDIGIT(*p)) { + do { + exp = exp * 10 + (*p - '0'); + p += 1; + } + while (ISDIGIT(*p)); + } + else { + p = pExp; } } if (expSign) { |