patch 8.2.4128: crash when method cannot be found

Problem:    Crash when method cannot be found. (Christian J. Robinson)
Solution:   Don't mix up pointer names.

diff --git a/src/eval.c b/src/eval.c
index bf65082e275496cb69f182e0a4cd46c5d3a4c301..2b145e1a2a4f2ebc47a55bb2235d0b7455d8c873 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -4050,16 +4050,21 @@ eval_method(
        if (**arg != '(' && alias == NULL
                                    && (paren = vim_strchr(*arg, '(')) != NULL)
        {
+           char_u *deref;
+
            *arg = name;
            *paren = NUL;
-           name = deref_function_name(arg, &tofree, evalarg, verbose);
-           if (name == NULL)
+           deref = deref_function_name(arg, &tofree, evalarg, verbose);
+           if (deref == NULL)
            {
                *arg = name + len;
                ret = FAIL;
            }
            else
+           {
+               name = deref;
                len = STRLEN(name);
+           }
            *paren = '(';
        }
 

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index a644e172c48ca22c300f0e079dc7bf185780d116..6428e6386a1a77e95d16f7dcb196def27d37cbe2 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -3214,6 +3214,14 @@ def Test_expr8_method_call_import()
   END
   CheckScriptSuccess(lines)
 
+  lines =<< trim END
+      vim9script
+      import './Xsquare.vim'
+
+      echo range(5)->Xsquare.NoSuchFunc()
+  END
+  CheckScriptFailure(lines, 'E1048: Item not found in script: NoSuchFunc')
+
   delete('Xsquare.vim')
 enddef
 

diff --git a/src/version.c b/src/version.c
index cff3cb8d39a7031f94b87628b857442079bbf1a9..af851d3a6a0d2e6aa3a268a1be2a381b1a6994c7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4128,
 /**/
     4127,
 /**/