GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-15 16:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1527: Vim9: Crash with string compound assignment

Browse Source 
Problem:  Vim9: Crash when using string compound assignment with wrong
          data type (lacygoill)
Solution: verify expected member type (Hirohito Higashi)

fixes: #17675
closes: #17693

Signed-off-by: Hirohito Higashi <h.east.727@gmail.com>
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Hirohito Higashi
2025-07-08 21:47:01 +02:00
committed by Christian Brabandt
parent 32a1b26ef3
commit 2ffd35fe8f
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/testdir/test_vim9_assign.vim
View File

@ -187,6 +187,7 @@ def Test_assignment()
v9.CheckDefFailure(['&notex += 3'], 'E113:') v9.CheckDefFailure(['&notex += 3'], 'E113:')
v9.CheckDefFailure(['&ts ..= "xxx"'], 'E1019:') v9.CheckDefFailure(['&ts ..= "xxx"'], 'E1019:')
v9.CheckDefFailure(['var d = {k: [0]}', 'd.k ..= "x"'], 'E1012: Type mismatch; expected list<number> but got string')
v9.CheckDefFailure(['&ts = [7]'], 'E1012:') v9.CheckDefFailure(['&ts = [7]'], 'E1012:')
v9.CheckDefExecFailure(['&ts = g:alist'], 'E1012: Type mismatch; expected number but got list<number>') v9.CheckDefExecFailure(['&ts = g:alist'], 'E1012: Type mismatch; expected number but got list<number>')
v9.CheckDefFailure(['&ts = "xx"'], 'E1012:') v9.CheckDefFailure(['&ts = "xx"'], 'E1012:')

2
src/version.c
View File

@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1527,
/**/ /**/
1526, 1526,
/**/ /**/

8
src/vim9compile.c
View File

@ -3444,7 +3444,13 @@ compile_assign_compound_op(cctx_T *cctx, cac_T *cac)
if (*cac->cac_op == '.') if (*cac->cac_op == '.')
{ {
if (may_generate_2STRING(-1, TOSTRING_NONE, cctx) == FAIL) expected = lhs->lhs_member_type;
stacktype = get_type_on_stack(cctx, 0);
if (expected != &t_string
&& need_type(stacktype, expected, FALSE, -1, 0, cctx,
FALSE, FALSE) == FAIL)
return FAIL;
else if (may_generate_2STRING(-1, TOSTRING_NONE, cctx) == FAIL)
return FAIL; return FAIL;
} }
else else