Skip to content

Commit

Permalink
patch 9.1.0665: Locked variable can be changed in a :for loop
Browse files Browse the repository at this point in the history
Problem:  Locked variable can be changed in a :for loop.
Solution: Always do a full permission check on the first loop iteration
          where ASSIGN_DECL is not set (zeertzjq).

related: vim#12470
fixes: vim#15450
closes: vim#15454

Signed-off-by: zeertzjq <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
  • Loading branch information
zeertzjq authored and chrisbra committed Aug 8, 2024
1 parent 39eff4c commit 6b97d7a
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/evalvars.c
Original file line number Diff line number Diff line change
Expand Up @@ -4100,7 +4100,7 @@ set_var_const(

// Modifying a final variable with a List value using the "+="
// operator is allowed. For other types, it is not allowed.
if (((flags & ASSIGN_FOR_LOOP) == 0
if ((((flags & ASSIGN_FOR_LOOP) == 0 || (flags & ASSIGN_DECL) == 0)
&& ((flags & ASSIGN_COMPOUND_OP) == 0
|| !type_inplace_modifiable))
? var_check_permission(di, name) == FAIL
Expand Down
27 changes: 26 additions & 1 deletion src/testdir/test_eval_stuff.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source view_util.vim
source shared.vim
import './vim9.vim' as v9

function s:foo() abort
try
Expand Down Expand Up @@ -126,7 +127,31 @@ func Test_for_invalid()
call assert_fails("for x in 99", 'E1098:')
call assert_fails("for x in function('winnr')", 'E1098:')
call assert_fails("for x in {'a': 9}", 'E1098:')
call assert_fails("for v:maxcol in range(1)", 'E46:')

let lines =<< trim END
for v:maxcol in range(5)
endfor
END

let save_v_maxcol = v:maxcol
call v9.CheckLegacyAndVim9Failure(lines, 'E46:')
call assert_equal(save_v_maxcol, v:maxcol)

let lines =<< trim END
for g:constvar in range(5)
endfor
END

const g:constvar = 10
call v9.CheckLegacyAndVim9Failure(lines, 'E741:')
call assert_equal(10, g:constvar)
unlet g:constvar

let g:constvar = 10
lockvar 0 g:constvar
call v9.CheckLegacyAndVim9Failure(lines, 'E1122:')
call assert_equal(10, g:constvar)
unlet g:constvar

if 0
/1/5/2/s/\n
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
665,
/**/
664,
/**/
Expand Down

0 comments on commit 6b97d7a

Please sign in to comment.