Mercurial > vim

changeset 27199:d4f254d02d7c v8.2.4128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4128: crash when method cannot be found Commit: https://github.com/vim/vim/commit/64283d5e1f5487e2dbaa17d478e6eae040daa064 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 18 10:37:29 2022 +0000 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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 18 Jan 2022 11:45:04 +0100
parents ebfde3a7b387
children 8e65bf8592f2
files src/eval.c src/testdir/test_vim9_expr.vim src/version.c
diffstat 3 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 = '(';
 	}
 
--- 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
 
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4128,
+/**/
     4127,
 /**/
     4126,