Mercurial > vim

changeset 24305:c88d0b5c5a42 v8.2.2693

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2693: Vim9: locked script variable can be changed Commit: https://github.com/vim/vim/commit/dcf29ac87f4d7a62c503ba6de0d92c7779446bf2 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Apr 2 14:44:02 2021 +0200 patch 8.2.2693: Vim9: locked script variable can be changed Problem: Vim9: locked script variable can be changed. Solution: Check legacy script variable for being locked. (issue https://github.com/vim/vim/issues/8031)
author Bram Moolenaar <Bram@vim.org>
date Fri, 02 Apr 2021 14:45:07 +0200
parents a78acfe60b4e
children 4a6be7bbbe68
files src/testdir/test_vim9_assign.vim src/version.c src/vim9execute.c
diffstat 3 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1355,7 +1355,17 @@ def Test_var_declaration_fails()
     enddef
     SetLocked()
   END
-  CheckScriptFailure(lines, 'E741: Value is locked: name')
+  CheckScriptFailure(lines, 'E741: Value is locked: name', 1)
+
+  lines =<< trim END
+    let s:legacy = 'one'
+    lockvar s:legacy
+    def SetLocked()
+      s:legacy = 'two'
+    enddef
+    call SetLocked()
+  END
+  CheckScriptFailure(lines, 'E741: Value is locked: s:legacy', 1)
 
   lines =<< trim END
     vim9script
@@ -1365,7 +1375,7 @@ def Test_var_declaration_fails()
     SetGlobalConst()
     g:globConst = 234
   END
-  CheckScriptFailure(lines, 'E741: Value is locked: globConst')
+  CheckScriptFailure(lines, 'E741: Value is locked: globConst', 1)
   unlet g:globConst
 
   lines =<< trim END
--- 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 */
 /**/
+    2693,
+/**/
     2692,
 /**/
     2691,
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1942,6 +1942,9 @@ call_def_function(
 			store_var(name, STACK_TV_BOT(0));
 		    else
 		    {
+			SOURCING_LNUM = iptr->isn_lnum;
+			if (var_check_permission(di, name) == FAIL)
+			    goto on_error;
 			clear_tv(&di->di_tv);
 			di->di_tv = *STACK_TV_BOT(0);
 		    }