diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-23 09:44:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-23 09:44:48 +0000 |
commit | 53737990fe160d3f0d04aab9234381e1455c8a57 (patch) | |
tree | 0ac45ec4fdf12039e129c5884f4821e1148d6c2a | |
parent | 151c170472226cd88cff19fa6b324d79974ddefb (diff) |
sprintf.c: width too big
* sprintf.c (rb_str_format): explicitly reject too big negative
width, instead of an empty string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | sprintf.c | 1 | ||||
-rw-r--r-- | test/ruby/test_sprintf.rb | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -648,6 +648,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) if (width < 0) { flags |= FMINUS; width = -width; + if (width < 0) rb_raise(rb_eArgError, "width too big"); } p++; goto retry; diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index f58686d93d..df004305ec 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -514,6 +514,12 @@ class TestSprintf < Test::Unit::TestCase assert_equal("!", sprintf("%*c", 0, ?!.ord), bug) end + def test_negative_width_overflow + assert_raise_with_message(ArgumentError, /too big/) do + sprintf("%*s", RbConfig::LIMITS["INT_MIN"], "") + end + end + def test_no_hidden_garbage fmt = [4, 2, 2].map { |x| "%0#{x}d" }.join('-') # defeats optimization ObjectSpace.count_objects(res = {}) # creates strings on first call |