]> granicus.if.org Git - vim/commitdiff
patch 8.2.2573: Vim9: using inalid pointer for error message v8.2.2573
authorBram Moolenaar <Bram@vim.org>
Sat, 6 Mar 2021 17:18:19 +0000 (18:18 +0100)
committerBram Moolenaar <Bram@vim.org>
Sat, 6 Mar 2021 17:18:19 +0000 (18:18 +0100)
Problem:    Vim9: using inalid pointer for error message.
Solution:   Use the right pointer. (closes #7921)

src/eval.c
src/testdir/test_vim9_expr.vim
src/version.c

index 6b12a9704c1e4e5e81d6fdfe71fa52c87136e334..1ad633965927520981182f8e3e5e905f27280886 100644 (file)
@@ -3130,7 +3130,7 @@ eval6(
         */
        if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[1]))
        {
-           error_white_both(p, 1);
+           error_white_both(*arg, 1);
            clear_tv(rettv);
            return FAIL;
        }
index 26a69324220e6eb938bf722ef1d0cb399000b9ac..a55de7e83acd224ba8176c181571c870177c5124 100644 (file)
@@ -1254,6 +1254,17 @@ def Test_expr5_vim9script()
       echo 'a' .. function('len')
   END
   CheckScriptFailure(lines, 'E729:', 2)
+
+  lines =<< trim END
+      vim9script
+      new
+      ['']->setline(1)
+      /pattern
+
+      eval 0
+      bwipe!
+  END
+  CheckScriptFailure(lines, "E1004: White space required before and after '/' at \"/pattern")
 enddef
 
 def Test_expr5_vim9script_channel()
index 4036e2ee19a4630de9006032fbc47eaba4ebb322..093f23d2d62466955a9ec2ddde18b5478fdfd574 100644 (file)
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2573,
 /**/
     2572,
 /**/