From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 2 Apr 2021 12:35:15 +0000 (+0200)
Subject: patch 8.2.2692: Vim9: locked script variable can be changed
X-Git-Tag: v8.2.2692
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5906aa7807e9a14159cbc09a141138a2a068ab2;p=vim

patch 8.2.2692: Vim9: locked script variable can be changed

Problem:    Vim9: locked script variable can be changed.
Solution:   Check for locked value. (closes #8031)
---

diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index 41ec7c7be..c06205225 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1346,6 +1346,17 @@ def Test_var_declaration_fails()
   CheckScriptFailure(lines, 'E741:')
   unlet g:constvar
 
+  lines =<< trim END
+    vim9script
+    var name = 'one'
+    lockvar name
+    def SetLocked()
+      name = 'two'
+    enddef
+    SetLocked()
+  END
+  CheckScriptFailure(lines, 'E741: Value is locked: name')
+
   lines =<< trim END
     vim9script
     def SetGlobalConst()
diff --git a/src/version.c b/src/version.c
index 72b798792..105958500 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 */
+/**/
+    2692,
 /**/
     2691,
 /**/
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 9b7f87b6c..69254bebe 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1958,6 +1958,13 @@ call_def_function(
 		    if (sv == NULL)
 			goto failed;
 		    --ectx.ec_stack.ga_len;
+
+		    // "const" and "final" are checked at compile time, locking
+		    // the value needs to be checked here.
+		    SOURCING_LNUM = iptr->isn_lnum;
+		    if (value_check_lock(sv->sv_tv->v_lock, sv->sv_name, FALSE))
+			goto on_error;
+
 		    clear_tv(sv->sv_tv);
 		    *sv->sv_tv = *STACK_TV_BOT(0);
 		}