diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-27 23:18:52 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-27 23:18:52 +0000 |
commit | 9ae4c2d59098ce6158385dda2539d2b36a03c090 (patch) | |
tree | 305ab7c3b2fff3a65b3f2ea3f40392f3c1835dd6 | |
parent | d1e2d6a9c52749912e8239d51b6beb5c6d9de943 (diff) |
sprintf.c: fix buffer overflow
* sprintf.c (rb_str_format): fix buffer overflow, length must be
greater than precision. reported by William Bowling <will AT
wbowling.info>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sprintf.c | 2 | ||||
-rw-r--r-- | test/ruby/test_sprintf.rb | 4 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Mar 28 08:18:51 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * sprintf.c (rb_str_format): fix buffer overflow, length must be + greater than precision. reported by William Bowling <will AT + wbowling.info>. + Sun Mar 27 12:13:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * sprintf.c (rb_str_format): convert Rational to floating point @@ -1070,7 +1070,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) } val = rb_int2str(num, 10); len = RSTRING_LEN(val) + zero; - if (prec >= len) ++len; /* integer part 0 */ + if (prec >= len) len = prec + 1; /* integer part 0 */ if (sign || (flags&FSPACE)) ++len; if (prec > 0) ++len; /* period */ CHECK(len > width ? len : width); diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index 501930a1e5..5732cecbf9 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -177,6 +177,10 @@ class TestSprintf < Test::Unit::TestCase assert_equal("x"*10+" 1.0", sprintf("x"*10+"%8.1f", 1r), bug11766) end + def test_rational_precision + assert_match(/\A0\.\d{600}\z/, sprintf("%.600f", 600**~60)) + end + def test_hash options = {:capture=>/\d+/} assert_equal("with options {:capture=>/\\d+/}", sprintf("with options %p" % options)) |