From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 1 Apr 2021 19:38:53 +0000 (+0200)
Subject: patch 8.2.2688: Vim9: crash when using s: for script variable
X-Git-Tag: v8.2.2688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca51cc0a335d0c449784440501c7d46ee8f84ce4;p=vim

patch 8.2.2688: Vim9: crash when using s: for script variable

Problem:    Vim9: crash when using s: for script variable.
Solution:   Pass the end pointer. (closes #8045)
---

diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 0d49a42d9..cb1592abf 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1644,9 +1644,10 @@ def Test_vim9script_funcref()
 
     # using the function from a compiled function
     def TestMore(): string
-      return anAlias.GetString('text')
+      var s = s:anAlias.GetString('foo')
+      return s .. anAlias.GetString('bar')
     enddef
-    assert_equal('text', TestMore())
+    assert_equal('foobar', TestMore())
 
     # error when using a function that isn't exported
     assert_fails('anAlias.Compare(1, 2)', 'E1049:')
diff --git a/src/version.c b/src/version.c
index 0fb8bc352..7da1fc4fa 100644
--- 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 */
+/**/
+    2688,
 /**/
     2687,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index ca1c89cc1..3fb4a8d20 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2822,7 +2822,7 @@ compile_load(
 		case 'v': res = generate_LOADV(cctx, name, error);
 			  break;
 		case 's': res = compile_load_scriptvar(cctx, name,
-							    NULL, NULL, error);
+							    NULL, &end, error);
 			  break;
 		case 'g': if (vim_strchr(name, AUTOLOAD_CHAR) == NULL)
 			      isn_type = ISN_LOADG;