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 41ec7c7..c062052 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1348,6 +1348,17 @@
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()
const g:globConst = 123
enddef
diff --git a/src/version.c b/src/version.c
index 72b7987..1059585 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2692,
+/**/
2691,
/**/
2690,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 9b7f87b..69254be 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1958,6 +1958,13 @@
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);
}