patch 9.1.0638: E1510 may happen when formatting a message for smsg()

Problem:  E1510 may happen when formatting a message
          (after 9.1.0181).
Solution: Only give E1510 when using typval. (zeertzjq)

closes: #15391

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/strings.c b/src/strings.c
index 20ca65d429fcd18c9d57ec9c6607888be78ec8ed..b8ea00bb3a57dee4aeb368d66ee3cd22179a422b 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -2497,7 +2497,8 @@ format_overflow_error(const char *pstart)
 get_unsigned_int(
     const char *pstart,
     const char **p,
-    unsigned int *uj)
+    unsigned int *uj,
+    int overflow_err)
 {
     *uj = **p - '0';
     ++*p;
@@ -2510,8 +2511,13 @@ get_unsigned_int(
 
     if (*uj > MAX_ALLOWED_STRING_WIDTH)
     {
-       format_overflow_error(pstart);
-       return FAIL;
+       if (overflow_err)
+       {
+           format_overflow_error(pstart);
+           return FAIL;
+       }
+       else
+           *uj = MAX_ALLOWED_STRING_WIDTH;
     }
 
     return OK;
@@ -2584,7 +2590,7 @@ parse_fmt_types(
                // Positional argument
                unsigned int uj;
 
-               if (get_unsigned_int(pstart, &p, &uj) == FAIL)
+               if (get_unsigned_int(pstart, &p, &uj, tvs != NULL) == FAIL)
                    goto error;
 
                pos_arg = uj;
@@ -2625,7 +2631,7 @@ parse_fmt_types(
                    // Positional argument field width
                    unsigned int uj;
 
-                   if (get_unsigned_int(arg + 1, &p, &uj) == FAIL)
+                   if (get_unsigned_int(arg + 1, &p, &uj, tvs != NULL) == FAIL)
                        goto error;
 
                    if (*p != '$')
@@ -2656,7 +2662,7 @@ parse_fmt_types(
                const char *digstart = p;
                unsigned int uj;
 
-               if (get_unsigned_int(digstart, &p, &uj) == FAIL)
+               if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                    goto error;
 
                if (*p == '$')
@@ -2680,7 +2686,7 @@ parse_fmt_types(
                        // Parse precision
                        unsigned int uj;
 
-                       if (get_unsigned_int(arg + 1, &p, &uj) == FAIL)
+                       if (get_unsigned_int(arg + 1, &p, &uj, tvs != NULL) == FAIL)
                            goto error;
 
                        if (*p == '$')
@@ -2712,7 +2718,7 @@ parse_fmt_types(
                    const char *digstart = p;
                    unsigned int uj;
 
-                   if (get_unsigned_int(digstart, &p, &uj) == FAIL)
+                   if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                        goto error;
 
                    if (*p == '$')
@@ -3025,7 +3031,7 @@ vim_vsnprintf_typval(
                const char *digstart = p;
                unsigned int uj;
 
-               if (get_unsigned_int(digstart, &p, &uj) == FAIL)
+               if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                    goto error;
 
                pos_arg = uj;
@@ -3067,7 +3073,7 @@ vim_vsnprintf_typval(
                    // Positional argument field width
                    unsigned int uj;
 
-                   if (get_unsigned_int(digstart, &p, &uj) == FAIL)
+                   if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                        goto error;
 
                    arg_idx = uj;
@@ -3085,8 +3091,13 @@ vim_vsnprintf_typval(
 
                if (j > MAX_ALLOWED_STRING_WIDTH)
                {
-                   format_overflow_error(digstart);
-                   goto error;
+                   if (tvs != NULL)
+                   {
+                       format_overflow_error(digstart);
+                       goto error;
+                   }
+                   else
+                       j = MAX_ALLOWED_STRING_WIDTH;
                }
 
                if (j >= 0)
@@ -3104,14 +3115,8 @@ vim_vsnprintf_typval(
                const char *digstart = p;
                unsigned int uj;
 
-               if (get_unsigned_int(digstart, &p, &uj) == FAIL)
-                   goto error;
-
-               if (uj > MAX_ALLOWED_STRING_WIDTH)
-               {
-                   format_overflow_error(digstart);
+               if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                    goto error;
-               }
 
                min_field_width = uj;
            }
@@ -3129,15 +3134,9 @@ vim_vsnprintf_typval(
                    const char *digstart = p;
                    unsigned int uj;
 
-                   if (get_unsigned_int(digstart, &p, &uj) == FAIL)
+                   if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                        goto error;
 
-                   if (uj > MAX_ALLOWED_STRING_WIDTH)
-                   {
-                       format_overflow_error(digstart);
-                       goto error;
-                   }
-
                    precision = uj;
                }
                else if (*p == '*')
@@ -3152,7 +3151,7 @@ vim_vsnprintf_typval(
                        // positional argument
                        unsigned int uj;
 
-                       if (get_unsigned_int(digstart, &p, &uj) == FAIL)
+                       if (get_unsigned_int(digstart, &p, &uj, tvs != NULL) == FAIL)
                            goto error;
 
                        arg_idx = uj;
@@ -3170,8 +3169,13 @@ vim_vsnprintf_typval(
 
                    if (j > MAX_ALLOWED_STRING_WIDTH)
                    {
-                       format_overflow_error(digstart);
-                       goto error;
+                       if (tvs != NULL)
+                       {
+                           format_overflow_error(digstart);
+                           goto error;
+                       }
+                       else
+                           j = MAX_ALLOWED_STRING_WIDTH;
                    }
 
                    if (j >= 0)

diff --git a/src/testdir/test_spellfile.vim b/src/testdir/test_spellfile.vim
index d8d954b3bf053017c1b7bc04b521ad15fc120a3d..8abb680622c1de7cd77b3dc9efa4c6c7821a1b02 100644 (file)
--- a/src/testdir/test_spellfile.vim
+++ b/src/testdir/test_spellfile.vim
@@ -845,6 +845,22 @@ func Test_spell_add_word()
   %bw!
 endfunc
 
+func Test_spell_add_long_word()
+  set spell spellfile=./Xspellfile.add spelllang=en
+
+  let word = repeat('a', 9000)
+  let v:errmsg = ''
+  " Spell checking doesn't really work for such a long word,
+  " but this should not cause an E1510 error.
+  exe 'spellgood ' .. word
+  call assert_equal('', v:errmsg)
+  call assert_equal([word], readfile('./Xspellfile.add'))
+
+  set spell& spellfile= spelllang& encoding=utf-8
+  call delete('./Xspellfile.add')
+  call delete('./Xspellfile.add.spl')
+endfunc
+
 func Test_spellfile_verbose()
   call writefile(['1', 'one'], 'XtestVerbose.dic', 'D')
   call writefile([], 'XtestVerbose.aff', 'D')

diff --git a/src/version.c b/src/version.c
index 4d9ba95218a039534bdc8b14683400c7c44b4452..f8d1762b843ab3e39b34791d97d62337de6fa3db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    638,
 /**/
     637,
 /**/