summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-sprintf/src/sprintf.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-05-09 07:40:08 +0900
committerGitHub <[email protected]>2017-05-09 07:40:08 +0900
commit011e0bb0d9db83ba560c82155921b66c42018bab (patch)
tree3c9d5aa2d53bfb4a8693ee6c19903df38b4ecff2 /mrbgems/mruby-sprintf/src/sprintf.c
parentef305305b43528d94b162078c421a0590ba1c438 (diff)
parent30df7c87624692227a24eee7ed7c2507b249e6e5 (diff)
downloadmruby-011e0bb0d9db83ba560c82155921b66c42018bab.tar.gz
mruby-011e0bb0d9db83ba560c82155921b66c42018bab.zip
Merge pull request #3649 from ksss/sprintf
Fix segmentation fault ref: #3648
Diffstat (limited to 'mrbgems/mruby-sprintf/src/sprintf.c')
-rw-r--r--mrbgems/mruby-sprintf/src/sprintf.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index 080e2549d..8df0d9360 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -982,15 +982,17 @@ retry:
}
if (dots) PUSH("..", 2);
- if (v < 0) {
- char c = sign_bits(base, p);
- FILL(c, prec - len);
- }
- else if ((flags & (FMINUS|FPREC)) != FMINUS) {
- char c = '0';
- FILL(c, prec - len);
+ if (prec > len) {
+ CHECK(prec - len);
+ if (v < 0) {
+ char c = sign_bits(base, p);
+ FILL(c, prec - len);
+ }
+ else if ((flags & (FMINUS|FPREC)) != FMINUS) {
+ char c = '0';
+ FILL(c, prec - len);
+ }
}
-
PUSH(s, len);
if (width > 0) {
FILL(' ', width);