Merge pull request #3503 from nobu/bug/sprintf-oob

Fix out-of-bound access
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-03-14 09:07:06 +09:00
committed by GitHub
2 changed files with 12 additions and 0 deletions
+1
View File
@@ -567,6 +567,7 @@ mrb_str_format(mrb_state *mrb, int argc, const mrb_value *argv, mrb_value fmt)
mrb_sym id = 0;
for (t = p; t < end && *t != '%'; t++) ;
if (t + 1 == end) ++t;
PUSH(p, t - p);
if (t >= end)
goto sprint_exit; /* end of fmt string */
+11
View File
@@ -30,3 +30,14 @@ assert("String#% with invalid chr") do
end
end
end
assert("String#% invalid format") do
assert_raise ArgumentError do
"%?" % ""
end
end
assert("String#% invalid format shared substring") do
fmt = ("x"*30+"%!")[0...-1]
assert_equal fmt, sprintf(fmt, "")
end