From be2e146a55e5210a2cf6303d51c91653c5ca14c2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 28 Apr 2017 02:05:54 +0000
Subject: sprintf.c: fix one-off bug

* sprintf.c (rb_str_format): `CHECK` just before `FILL_`, but
  after another `PUSH`.  fix one-off bug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 sprintf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sprintf.c b/sprintf.c
index fb11a6db75..baee759ded 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -791,7 +791,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 	    {
 		volatile VALUE val = GETARG();
                 int valsign;
-		char nbuf[64], *s;
+		char nbuf[BIT_DIGITS(SIZEOF_LONG*CHAR_BIT)+2], *s;
 		const char *prefix = 0;
 		int sign = 0, dots = 0;
 		char sc = 0;
@@ -1014,9 +1014,9 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		    int plen = (int)strlen(prefix);
 		    PUSH(prefix, plen);
 		}
-		CHECK(prec - len);
 		if (dots) PUSH("..", 2);
 		if (prec > len) {
+		    CHECK(prec - len);
 		    if (!sign && valsign < 0) {
 			char c = sign_bits(base, p);
 			FILL_(c, prec - len);
@@ -1073,15 +1073,15 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 		if (prec >= len) len = prec + 1; /* integer part 0 */
 		if (sign || (flags&FSPACE)) ++len;
 		if (prec > 0) ++len; /* period */
-		CHECK(len > width ? len : width);
 		fill = width > len ? width - len : 0;
-		if (fill && !(flags&FMINUS) && !(flags&FZERO)) {
+		CHECK(fill + len);
+		if (fill && !(flags&(FMINUS|FZERO))) {
 		    FILL_(' ', fill);
 		}
 		if (sign || (flags&FSPACE)) {
 		    buf[blen++] = sign > 0 ? '+' : sign < 0 ? '-' : ' ';
 		}
-		if (fill && !(flags&FMINUS) && (flags&FZERO)) {
+		if (fill && (flags&(FMINUS|FZERO)) == FZERO) {
 		    FILL_('0', fill);
 		}
 		len = RSTRING_LEN(val) + zero;
-- 
cgit v1.2.3