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

The width printf specifier may be negative; fix #3498

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-03-11 15:22:54 +09:00
parent f30ec2dfb0
commit 94395e81c1
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-sprintf/src/sprintf.c
+9 -6
View File
@@ -116,6 +116,7 @@ mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
#define CHECK(l) do {\
/* int cr = ENC_CODERANGE(result);*/\
if ((l) < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "illegal specifier"); \
while ((l) >= bsiz - blen) {\
bsiz*=2;\
if (bsiz < 0) mrb_raise(mrb, E_ARGUMENT_ERROR, "too big specifier"); \
@@ -766,7 +767,7 @@ retry:
width -= (int)slen;
if (!(flags&FMINUS)) {
CHECK(width);
while (width--) {
while (width-- > 0) {
buf[blen++] = ' ';
}
}
@@ -775,7 +776,7 @@ retry:
blen += len;
if (flags&FMINUS) {
CHECK(width);
while (width--) {
while (width-- > 0) {
buf[blen++] = ' ';
}
}
@@ -982,7 +983,7 @@ retry:
width -= prec;
}
if (!(flags&FMINUS)) {
if (!(flags&FMINUS) && width > 0) {
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
@@ -1012,9 +1013,11 @@ retry:
}
PUSH(s, len);
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
if (width > 0) {
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
}
}
}
break;