vim-patch:7.4.2280

Problem:    printf() doesn't handle infinity float values correctly.
Solution:   Add a table with possible infinity values. (Dominique Pelle)

https://github.com/vim/vim/commit/e999782e369999539a1783a7ebe4eadcc6da28a8

3 files changed, 119 insertions, 36 deletions

diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 47ee311bd4..e8d70f2676 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -753,6 +753,22 @@ int vim_snprintf(char *str, size_t str_m, const char *fmt, ...)
   return str_l;
 }
 
+// Return the representation of infinity for printf() function:
+// "-inf", "inf", "+inf", " inf", "-INF", "INF", "+INF" or " INF".
+static const char *infinity_str(bool positive, char fmt_spec,
+                                int force_sign, int space_for_positive)
+{
+  static const char *table[] = {
+    "-inf", "inf", "+inf", " inf",
+    "-INF", "INF", "+INF", " INF"
+  };
+  int idx = positive * (1 + force_sign + force_sign * space_for_positive);
+  if (ASCII_ISUPPER(fmt_spec)) {
+    idx += 4;
+  }
+  return table[idx];
+}
+
 
 /// Write formatted value to the string
 ///
@@ -1209,10 +1225,10 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap,
             }
 
             if (fmt_spec == 'f' && abs_f > 1.0e307) {
-              const char inf_str[] = f < 0 ? "-inf" : "inf";
-              // avoid a buffer overflow
-              memmove(tmp, inf_str, sizeof(inf_str) - 1);
-              str_arg_l = sizeof(inf_str) - 1;
+              STRCPY(tmp, infinity_str(f > 0.0, fmt_spec,
+                                       force_sign, space_for_positive));
+              str_arg_l = STRLEN(tmp);
+              zero_padding = 0;
             } else {
               format[0] = '%';
               int l = 1;
@@ -1231,25 +1247,22 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap,
               }
               format[l] = (char)(fmt_spec == 'F' ? 'f' : fmt_spec);
               format[l + 1] = NUL;
-              assert(l + 1 < (int)sizeof(format));
-              str_arg_l = (size_t)snprintf(tmp, sizeof(tmp), format, f);
-              assert(str_arg_l < sizeof(tmp));
 
-              // Be consistent: Change "1.#IND" to "nan" and
-              // "1.#INF" to "inf".
-              char *s = *tmp == '-' ? tmp + 1 : tmp;
-              if (STRNCMP(s, "1.#INF", 6) == 0) {
-                STRCPY(s, "inf");
-              } else if (STRNCMP(s, "1.#IND", 6) == 0) {
-                STRCPY(s, "nan");
-              }
-              // Remove sign before "nan"
-              if (STRNCMP(tmp, "-nan", 4) == 0) {
-                STRCPY(tmp, "nan");
-              }
-              // Add sign before "inf" if needed.
-              if (isinf(f) == -1 && STRNCMP(tmp, "inf", 3) == 0) {
-                STRCPY(tmp, "-inf");
+              if (isnan(f)) {
+                // Not a number: nan or NAN
+                STRCPY(tmp, ASCII_ISUPPER(fmt_spec) ? "NAN" : "nan");
+                str_arg_l = 3;
+                zero_padding = 0;
+              } else if (isinf(f)) {
+                STRCPY(tmp, infinity_str(f > 0.0, fmt_spec,
+                                         force_sign, space_for_positive));
+                str_arg_l = STRLEN(tmp);
+                zero_padding = 0;
+              } else {
+                // Regular float number
+                assert(l + 1 < (int)sizeof(format));
+                str_arg_l = (size_t)snprintf(tmp, sizeof(tmp), format, f);
+                assert(str_arg_l < sizeof(tmp));
               }
 
               if (remove_trailing_zeroes) {
diff --git a/src/nvim/testdir/test_expr.vim b/src/nvim/testdir/test_expr.vim
index fc804f3a15..b7eeb6d48c 100644
--- a/src/nvim/testdir/test_expr.vim
+++ b/src/nvim/testdir/test_expr.vim
@@ -141,7 +141,7 @@ function Test_printf_misc()
   call assert_equal('173', printf('%O', 123))
   call assert_equal('7b', printf('%x', 123))
   call assert_equal('7B', printf('%X', 123))
-  call assert_equal('{', printf('%c', 123))
+  call assert_equal('#', printf('%c', 123))
   call assert_equal('abc', printf('%s', 'abc'))
   call assert_equal('abc', printf('%S', 'abc'))
 
@@ -152,13 +152,22 @@ function Test_printf_misc()
   call assert_equal(' 123', printf('%  d', 123))
   call assert_equal('-123', printf('% d', -123))
 
+  call assert_equal('123', printf('%2d', 123))
+  call assert_equal('   123', printf('%6d', 123))
+  call assert_equal('000123', printf('%06d', 123))
+  call assert_equal('+00123', printf('%+06d', 123))
+  call assert_equal(' 00123', printf('% 06d', 123))
+  call assert_equal('  +123', printf('%+6d', 123))
+  call assert_equal('   123', printf('% 6d', 123))
+  call assert_equal('  -123', printf('% 6d', -123))
+  call assert_equal('+123  ', printf('%-+6d', 123))
+  call assert_equal(' 123  ', printf('%- 6d', 123))
+  call assert_equal('-123  ', printf('%- 6d', -123))
+
   call assert_equal('00123', printf('%.*d', 5, 123))
   call assert_equal('  123', printf('% *d', 5, 123))
   call assert_equal(' +123', printf('%+ *d', 5, 123))
 
-  call assert_equal('123', printf('%2d', 123))
-  call assert_equal('  123', printf('%5d', 123))
-  call assert_equal('00123', printf('%05d', 123))
   call assert_equal('123  ', printf('%-5d', 123))
   call assert_equal('0x7b', printf('%#x', 123))
   call assert_equal('0X7B', printf('%#X', 123))
@@ -191,20 +200,81 @@ endfunc
 function Test_printf_float()
   call assert_equal('1.230000', printf('%f', 1.23))
   call assert_equal('1.230000', printf('%F', 1.23))
-  call assert_equal('1.23', printf('%g', 1.23))
-  call assert_equal('1.23', printf('%G', 1.23))
+  call assert_equal('9999999.9', printf('%g', 9999999.9))
+  call assert_equal('9999999.9', printf('%G', 9999999.9))
+  call assert_equal('1.00000001e7', printf('%.8g', 10000000.1))
+  call assert_equal('1.00000001E7', printf('%.8G', 10000000.1))
   call assert_equal('1.230000e+00', printf('%e', 1.23))
   call assert_equal('1.230000E+00', printf('%E', 1.23))
   call assert_equal('1.200000e-02', printf('%e', 0.012))
   call assert_equal('-1.200000e-02', printf('%e', -0.012))
-  call assert_equal('1.2', printf('%.1f', 1.23))
-
+  call assert_equal('0.33', printf('%.2f', 1.0/3.0))
+  call assert_equal('  0.33', printf('%6.2f', 1.0/3.0))
+  call assert_equal(' -0.33', printf('%6.2f', -1.0/3.0))
+  call assert_equal('000.33', printf('%06.2f', 1.0/3.0))
+  " FIXME: call assert_equal('-00.33', printf('%06.2f', -1.0/3.0))
+  " FIXME: call assert_equal('-00.33', printf('%+06.2f', -1.0/3.0))
+  " FIXME: call assert_equal('+00.33', printf('%+06.2f', 1.0/3.0))
+  " FIXME: call assert_equal(' 00.33', printf('% 06.2f', 1.0/3.0))
+
+  " Float infinity can be signed.
   call assert_equal('inf', printf('%f', 1.0/0.0))
-
-  call assert_match('^-inf$', printf('%f', -1.0/0.0))
-
-  call assert_match('^nan$', printf('%f', sqrt(-1.0)))
-  call assert_match('^nan$', printf('%f', 0.0/0.0))
+  call assert_equal('-inf', printf('%f', -1.0/0.0))
+  call assert_equal('inf', printf('%g', 1.0/0.0))
+  call assert_equal('-inf', printf('%g', -1.0/0.0))
+  call assert_equal('inf', printf('%e', 1.0/0.0))
+  call assert_equal('-inf', printf('%e', -1.0/0.0))
+  call assert_equal('INF', printf('%E', 1.0/0.0))
+  call assert_equal('-INF', printf('%E', -1.0/0.0))
+  call assert_equal('INF', printf('%E', 1.0/0.0))
+  call assert_equal('-INF', printf('%G', -1.0/0.0))
+  call assert_equal('+inf', printf('%+f', 1.0/0.0))
+  call assert_equal('-inf', printf('%+f', -1.0/0.0))
+  call assert_equal(' inf', printf('% f',  1.0/0.0))
+  call assert_equal('   inf', printf('%6f', 1.0/0.0))
+  call assert_equal('  -inf', printf('%6f', -1.0/0.0))
+  call assert_equal('   inf', printf('%6g', 1.0/0.0))
+  call assert_equal('  -inf', printf('%6g', -1.0/0.0))
+  call assert_equal('  +inf', printf('%+6f', 1.0/0.0))
+  call assert_equal('   inf', printf('% 6f', 1.0/0.0))
+  call assert_equal('  +inf', printf('%+06f', 1.0/0.0))
+  call assert_equal('inf   ', printf('%-6f', 1.0/0.0))
+  call assert_equal('-inf  ', printf('%-6f', -1.0/0.0))
+  call assert_equal('+inf  ', printf('%-+6f', 1.0/0.0))
+  call assert_equal(' inf  ', printf('%- 6f', 1.0/0.0))
+  call assert_equal('INF   ', printf('%-6G', 1.0/0.0))
+  call assert_equal('-INF  ', printf('%-6G', -1.0/0.0))
+  call assert_equal('INF   ', printf('%-6E', 1.0/0.0))
+  call assert_equal('-INF  ', printf('%-6E', -1.0/0.0))
+  call assert_equal("str2float('inf')", printf('%s', 1.0/0.0))
+  call assert_equal("-str2float('inf')", printf('%s', -1.0/0.0))
+
+  " Float zero can be signed.
+  call assert_equal('0.000000', printf('%f', 1.0/(1.0/0.0)))
+  call assert_equal('-0.000000', printf('%f', 1.0/(-1.0/0.0)))
+  call assert_equal('0.0', printf('%s', 1.0/(1.0/0.0)))
+  call assert_equal('-0.0', printf('%s', 1.0/(-1.0/0.0)))
+  call assert_equal('0.0', printf('%S', 1.0/(1.0/0.0)))
+  call assert_equal('-0.0', printf('%S', 1.0/(-1.0/0.0)))
+
+  " Float nan (not a number) has no sign.
+  call assert_equal('nan', printf('%f', sqrt(-1.0)))
+  call assert_equal('nan', printf('%f', 0.0/0.0))
+  call assert_equal('nan', printf('%f', -0.0/0.0))
+  call assert_equal('nan', printf('%g', 0.0/0.0))
+  call assert_equal('nan', printf('%e', 0.0/0.0))
+  call assert_equal('NAN', printf('%G', 0.0/0.0))
+  call assert_equal('NAN', printf('%E', 0.0/0.0))
+  call assert_equal('NAN', printf('%G', -0.0/0.0))
+  call assert_equal('NAN', printf('%E', -0.0/0.0))
+  call assert_equal('   nan', printf('%6f', 0.0/0.0))
+  call assert_equal('   nan', printf('%06f', 0.0/0.0))
+  call assert_equal('nan   ', printf('%-6f', 0.0/0.0))
+  call assert_equal('nan   ', printf('%- 6f', 0.0/0.0))
+  call assert_equal("str2float('nan')", printf('%s', 0.0/0.0))
+  call assert_equal("str2float('nan')", printf('%s', -0.0/0.0))
+  call assert_equal("str2float('nan')", printf('%S', 0.0/0.0))
+  call assert_equal("str2float('nan')", printf('%S', -0.0/0.0))
 
   call assert_fails('echo printf("%f", "a")', 'E807:')
 endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 5479e9f91f..09e27d210b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -161,7 +161,7 @@ static int included_patches[] = {
   // 2283,
   // 2282 NA
   // 2281 NA
-  // 2280,
+  2280,
   2279,
   // 2278 NA
   2277,