admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

sprintf.c: width may have been INT_MAX.

Browse Source 
Now `width` is limited to `INT16_MIN..INT16_MAX`.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-09-14 14:09:13 +09:00
parent 6dbf49fdb4
commit e5e7bd29ef
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-sprintf/src/sprintf.c
+5 -2
View File
@@ -692,6 +692,9 @@ retry:
CHECK_FOR_WIDTH(flags);
flags |= FWIDTH;
GETASTER(width);
if (width > INT16_MAX || INT16_MIN > width) {
mrb_raise(mrb, E_ARGUMENT_ERROR, "width too big");
}
if (width < 0) {
flags |= FMINUS;
width = -width;
@@ -1056,7 +1059,7 @@ retry:
need = BIT_DIGITS(i);
}
if (need > MRB_INT_MAX - ((flags&FPREC) ? prec : 6)) {
too_big_width:
too_big_width_prec:
mrb_raise(mrb, E_ARGUMENT_ERROR,
(width > prec ? "width too big" : "prec too big"));
}
@@ -1064,7 +1067,7 @@ retry:
if ((flags&FWIDTH) && need < width)
need = width;
if (need > MRB_INT_MAX - 20) {
goto too_big_width;
goto too_big_width_prec;
}
need += 20;