# HG changeset patch # User Bram Moolenaar # Date 1617367506 -7200 # Node ID 17b49af767666a17e1ecb63ac6dc53f968433671 # Parent 9b8f55dc88b74b3afd7458be48fb4269ac87c4cf patch 8.2.2692: Vim9: locked script variable can be changed Commit: https://github.com/vim/vim/commit/f5906aa7807e9a14159cbc09a141138a2a068ab2 Author: Bram Moolenaar Date: Fri Apr 2 14:35:15 2021 +0200 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 https://github.com/vim/vim/issues/8031) diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1348,6 +1348,17 @@ def Test_var_declaration_fails() 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 --- 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 */ /**/ + 2692, +/**/ 2691, /**/ 2690, diff --git a/src/vim9execute.c b/src/vim9execute.c --- 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); }