* util.c (ruby_strtod): check there is at least 1 digit after

  "0x" before ".". [ruby-dev:42183] #3790

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 76f3dfdb9d..1fde82cc6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep  6 09:47:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* util.c (ruby_strtod): check there is at least 1 digit after
+	  "0x" before ".". [ruby-dev:42183] #3790
+
 Mon Sep  6 09:44:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* util.c (ruby_strtod): check integr overflow.
diff --git a/test/ruby/test_float.rb b/test/ruby/test_float.rb
index 08ec63a6f9..1146b583f0 100644
--- a/test/ruby/test_float.rb
+++ b/test/ruby/test_float.rb
@@ -447,6 +447,7 @@ class TestFloat < Test::Unit::TestCase
     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('0x') }
     assert_raise(ArgumentError) { Float('0xf.fp') }
     assert_equal(Float::INFINITY, Float('0xf.fp1000000000000000'))
     assert_equal(1, suppress_warning {Float("1e10_00")}.infinite?)
diff --git a/util.c b/util.c
index 9d10498a66..40b4573660 100644
--- a/util.c
+++ b/util.c
@@ -2123,10 +2123,11 @@ break2:
 	    s0 = ++s;
 	    adj = 0;
 
-	    while (*++s && (s1 = strchr(hexdigit, *s))) {
+	    if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
+	    do {
 		adj *= 16;
 		adj += (s1 - hexdigit) & 15;
-	    }
+	    } while (*++s && (s1 = strchr(hexdigit, *s)));
 
 	    if (*s == '.') {
 		aadj = 1.;