patch 9.1.1527: Vim9: Crash with string compound assignment
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>
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index c0f56d9..e955064 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -187,6 +187,7 @@
v9.CheckDefFailure(['¬ex += 3'], 'E113:')
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.CheckDefExecFailure(['&ts = g:alist'], 'E1012: Type mismatch; expected number but got list<number>')
v9.CheckDefFailure(['&ts = "xx"'], 'E1012:')
diff --git a/src/version.c b/src/version.c
index 5a7225b..c840960 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1527,
+/**/
1526,
/**/
1525,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index b3cf86c..131bab7 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3444,7 +3444,13 @@
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;
}
else