thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3266: Vim9: assignment with two indexes may check next line

Browse Source 
Problem:    Vim9: assignment with two indexes may check next line.
Solution:   Limit the number of lines to avoid checking the next line when
            assiging to a LHS subscript. (closes #8660)
This commit is contained in:
Bram Moolenaar
2021-08-01 13:17:17 +02:00
parent 78ba933d18
commit e97976baa7
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/vim9compile.c
View File

@@ -6536,19 +6536,25 @@ compile_load_lhs(
{
size_t varlen = lhs->lhs_varlen;
int c = var_start[varlen];
int lines_len = cctx->ctx_ufunc->uf_lines.ga_len;
char_u *p = var_start;
garray_T *stack = &cctx->ctx_type_stack;
int res;
// Evaluate "ll[expr]" of "ll[expr][idx]"
// Evaluate "ll[expr]" of "ll[expr][idx]". End the line with a NUL and
// limit the lines array length to avoid skipping to a following line.
var_start[varlen] = NUL;
if (compile_expr0(&p, cctx) == OK && p != var_start + varlen)
cctx->ctx_ufunc->uf_lines.ga_len = cctx->ctx_lnum + 1;
res = compile_expr0(&p, cctx);
var_start[varlen] = c;
cctx->ctx_ufunc->uf_lines.ga_len = lines_len;
if (res == FAIL || p != var_start + varlen)
{
// this should not happen
emsg(_(e_missbrac));
var_start[varlen] = c;
if (res != FAIL)
emsg(_(e_missbrac));
return FAIL;
}
var_start[varlen] = c;
lhs->lhs_type = stack->ga_len == 0 ? &t_void
: ((type_T **)stack->ga_data)[stack->ga_len - 1];