summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-23 03:19:58 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-23 03:19:58 (GMT)
commit815ab02971f7b94e276823f407b8fc2723bf703b (patch)
tree018e801bbf4fbe5d45fb855024a4165b6bd0c6bd
parent54f344095916f83a2755a177f94e65a1c390a612 (diff)
* util.c (ruby_strtod): make sure to have digit-sequence after 'p'
for hexadecimal-floating-constant. [ruby-dev:42105] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_float.rb2
-rw-r--r--util.c8
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index edf878b..004ac1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 23 02:23:05 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * util.c (ruby_strtod): make sure to have digit-sequence after 'p'
+ for hexadecimal-floating-constant. [ruby-dev:42105]
+
Mon Aug 23 00:23:07 2010 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: [ruby-core:31695]
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index a8ce76e..e534ab2 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -446,6 +446,8 @@ class TestFloat < Test::Unit::TestCase
assert_equal(1, suppress_warning {Float(([1] * 10000).join)}.infinite?)
assert(!Float(([1] * 10000).join("_")).infinite?) # is it really OK?
assert_raise(ArgumentError) { Float("1.0\x001") }
+ assert_equal(15.9375, Float('0xf.fp0'))
+ assert_raise(ArgumentError) { Float('0xf.fp') }
assert_equal(1, suppress_warning {Float("1e10_00")}.infinite?)
assert_raise(TypeError) { Float(nil) }
o = Object.new
diff --git a/util.c b/util.c
index 76ba457..762d97f 100644
--- a/util.c
+++ b/util.c
@@ -2141,11 +2141,15 @@ break2:
if (abs(dsign) == 1) s++;
else dsign = 1;
- for (nd = 0; (c = *s) >= '0' && c <= '9'; s++) {
+ nd = 0;
+ c = *s;
+ if (c < '0' || '9' < c) goto ret0;
+ do {
nd *= 10;
nd += c;
nd -= '0';
- }
+ c = *++s;
+ } while ('0' <= c && c <= '9');
dval(rv) = ldexp(adj, nd * dsign);
}
else {