From 4fdfb28e7d2e3eefc0df1e1d034fbfc932c0d2a1 Mon Sep 17 00:00:00 2001

From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>

Date: Thu, 14 Sep 2017 11:35:52 +0000

Subject: [PATCH] merge revision(s) 58453,58454: [Backport #13499]

	Fix space flag when Inf/NaN and width==3

	* sprintf.c (rb_str_format): while `"% 2f"` and `"% 4f"` result in

	  `" Inf"` and `" Inf"` respectively, `"% 3f"` results in

	  `"Inf"` (no space).

	Refactor "%f" % Inf/NaN

	* sprintf.c (rb_str_format): as for non-finite float, calculate

	  the exact needed size with the space flag.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@59901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

---

 ChangeLog                 |   12 ++++++++++

 sprintf.c                 |   37 +++++++++++++++-----------------

 test/ruby/test_sprintf.rb |   52 ++++++++++++++++++++++++++++++++++++++++++++++

 3 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog

index ef36ffbd1552..a4594f678f8c 100644

--- a/ChangeLog

+++ b/ChangeLog

@@ -4,6 +4,18 @@

 	  protocol list.

 	  The protocol list from OpenSSL is not null-terminated.

 	  patched by Kazuki Yamaguchi [Bug #11810] [ruby-core:72082]

+

+Thu Sep 14 20:33:52 2017  Nobuyoshi Nakada  <nobu@ruby-lang.org>

+

+	Fix space flag when Inf/NaN and width==3

+

+	* sprintf.c (rb_str_format): while "% 2f" and "% 4f" result in " Inf"

+	  and " Inf" respectively, "% 3f" results in "Inf" (no space).

+

+	Refactor "%f" % Inf/NaN

+

+	* sprintf.c (rb_str_format): as for non-finite float, calculate the

+	  exact needed size with the space flag.

 Sun Sep 10 10:10:05 2017  SHIBATA Hiroshi  <hsbt@ruby-lang.org>

diff --git a/sprintf.c b/sprintf.c

index 70c7cceb14d6..db7499979dc3 100644

--- a/sprintf.c

+++ b/sprintf.c

@@ -1025,6 +1025,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)

 		fval = RFLOAT_VALUE(rb_Float(val));

 		if (isnan(fval) || isinf(fval)) {

 		    const char *expr;

+		    int elen;

+		    char sign = '\0';

 		    if (isnan(fval)) {

 			expr = "NaN";

@@ -1033,33 +1035,28 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)

 			expr = "Inf";

 		    }

 		    need = (int)strlen(expr);

-		    if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))

-			need++;

+		    elen = need;

+		    i = 0;

+		    if (!isnan(fval) && fval < 0.0)

+			sign = '-';

+		    else if (flags & (FPLUS|FSPACE))

+			sign = (flags & FPLUS) ? '+' : ' ';

+		    if (sign)

+			++need;

 		    if ((flags & FWIDTH) && need < width)

 			need = width;

-		    CHECK(need + 1);

-		    snprintf(&buf[blen], need + 1, "%*s", need, "");

+		    FILL(' ', need);

 		    if (flags & FMINUS) {

-			if (!isnan(fval) && fval < 0.0)

-			    buf[blen++] = '-';

-			else if (flags & FPLUS)

-			    buf[blen++] = '+';

-			else if (flags & FSPACE)

-			    blen++;

-			memcpy(&buf[blen], expr, strlen(expr));

+			if (sign)

+			    buf[blen - need--] = sign;

+			memcpy(&buf[blen - need], expr, elen);

 		    }

 		    else {

-			if (!isnan(fval) && fval < 0.0)

-			    buf[blen + need - strlen(expr) - 1] = '-';

-			else if (flags & FPLUS)

-			    buf[blen + need - strlen(expr) - 1] = '+';

-			else if ((flags & FSPACE) && need > width)

-			    blen++;

-			memcpy(&buf[blen + need - strlen(expr)], expr,

-			       strlen(expr));

+			if (sign)

+			    buf[blen - elen - 1] = sign;

+			memcpy(&buf[blen - elen], expr, elen);

 		    }

-		    blen += strlen(&buf[blen]);

 		    break;

 		}

diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb

index 3fd4736a54b0..ab3037a8f267 100644

--- a/test/ruby/test_sprintf.rb

+++ b/test/ruby/test_sprintf.rb

@@ -84,6 +84,18 @@ def test_nan

     assert_equal("NaN", sprintf("%-f", nan))

     assert_equal("+NaN", sprintf("%+f", nan))

+    assert_equal("NaN", sprintf("%3f", nan))

+    assert_equal("NaN", sprintf("%-3f", nan))

+    assert_equal("+NaN", sprintf("%+3f", nan))

+

+    assert_equal(" NaN", sprintf("% 3f", nan))

+    assert_equal(" NaN", sprintf("%- 3f", nan))

+    assert_equal("+NaN", sprintf("%+ 3f", nan))

+

+    assert_equal(" NaN", sprintf("% 03f", nan))

+    assert_equal(" NaN", sprintf("%- 03f", nan))

+    assert_equal("+NaN", sprintf("%+ 03f", nan))

+

     assert_equal("     NaN", sprintf("%8f", nan))

     assert_equal("NaN     ", sprintf("%-8f", nan))

     assert_equal("    +NaN", sprintf("%+8f", nan))

@@ -107,6 +119,26 @@ def test_inf

     assert_equal("Inf", sprintf("%-f", inf))

     assert_equal("+Inf", sprintf("%+f", inf))

+    assert_equal(" Inf", sprintf("% f", inf))

+    assert_equal(" Inf", sprintf("%- f", inf))

+    assert_equal("+Inf", sprintf("%+ f", inf))

+

+    assert_equal(" Inf", sprintf("% 0f", inf))

+    assert_equal(" Inf", sprintf("%- 0f", inf))

+    assert_equal("+Inf", sprintf("%+ 0f", inf))

+

+    assert_equal("Inf", sprintf("%3f", inf))

+    assert_equal("Inf", sprintf("%-3f", inf))

+    assert_equal("+Inf", sprintf("%+3f", inf))

+

+    assert_equal(" Inf", sprintf("% 3f", inf))

+    assert_equal(" Inf", sprintf("%- 3f", inf))

+    assert_equal("+Inf", sprintf("%+ 3f", inf))

+

+    assert_equal(" Inf", sprintf("% 03f", inf))

+    assert_equal(" Inf", sprintf("%- 03f", inf))

+    assert_equal("+Inf", sprintf("%+ 03f", inf))

+

     assert_equal("     Inf", sprintf("%8f", inf))

     assert_equal("Inf     ", sprintf("%-8f", inf))

     assert_equal("    +Inf", sprintf("%+8f", inf))

@@ -127,6 +159,26 @@ def test_inf

     assert_equal("-Inf", sprintf("%-f", -inf))

     assert_equal("-Inf", sprintf("%+f", -inf))

+    assert_equal("-Inf", sprintf("% f", -inf))

+    assert_equal("-Inf", sprintf("%- f", -inf))

+    assert_equal("-Inf", sprintf("%+ f", -inf))

+

+    assert_equal("-Inf", sprintf("% 0f", -inf))

+    assert_equal("-Inf", sprintf("%- 0f", -inf))

+    assert_equal("-Inf", sprintf("%+ 0f", -inf))

+

+    assert_equal("-Inf", sprintf("%4f", -inf))

+    assert_equal("-Inf", sprintf("%-4f", -inf))

+    assert_equal("-Inf", sprintf("%+4f", -inf))

+

+    assert_equal("-Inf", sprintf("% 4f", -inf))

+    assert_equal("-Inf", sprintf("%- 4f", -inf))

+    assert_equal("-Inf", sprintf("%+ 4f", -inf))

+

+    assert_equal("-Inf", sprintf("% 04f", -inf))

+    assert_equal("-Inf", sprintf("%- 04f", -inf))

+    assert_equal("-Inf", sprintf("%+ 04f", -inf))

+

     assert_equal("    -Inf", sprintf("%8f", -inf))

     assert_equal("-Inf    ", sprintf("%-8f", -inf))

     assert_equal("    -Inf", sprintf("%+8f", -inf))