kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

Fix dtoa buffer overrun 

https://hackerone.com/reports/1248108
This commit is contained in:
Nobuyoshi Nakada 2021-07-01 06:39:17 +09:00
parent cf2bbcfff2
commit d0a822eec5
Notes: git 2022-04-12 21:31:09 +09:00 
Merged: https://github.com/ruby/ruby/pull/5794
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
missing/dtoa.c
View File

@ -1552,6 +1552,7 @@ break2:
if (!*++s || !(s1 = strchr(hexdigit, *s))) goto ret0;
if (*s == '0') {
while (*++s == '0');
if (!*s) goto ret;
s1 = strchr(hexdigit, *s);
}
if (s1 != NULL) {
@ -1574,7 +1575,7 @@ break2:
for (; *s && (s1 = strchr(hexdigit, *s)); ++s) {
adj += aadj * ((s1 - hexdigit) & 15);
if ((aadj /= 16) == 0.0) {
while (strchr(hexdigit, *++s));
while (*++s && strchr(hexdigit, *s));
break;
}
}

18
test/ruby/test_float.rb
View File

@ -171,6 +171,24 @@ class TestFloat < Test::Unit::TestCase
assert_raise(ArgumentError, n += z + "A") {Float(n)}
assert_raise(ArgumentError, n += z + ".0") {Float(n)}
end
x = nil
2000.times do
x = Float("0x"+"0"*30)
break unless x == 0.0
end
assert_equal(0.0, x, ->{"%a" % x})
x = nil
2000.times do
begin
x = Float("0x1."+"0"*270)
rescue ArgumentError => e
raise unless /"0x1\.0{270}"/ =~ e.message
else
break
end
end
assert_nil(x, ->{"%a" % x})
end
def test_divmod