patch 8.2.2272: Vim9: extend() can violate the type of a variable
Problem: Vim9: extend() can violate the type of a variable.
Solution: Add the type to the dictionary or list and check items against it.
(closes #7593)
diff --git a/src/vim9script.c b/src/vim9script.c
index 269300c..b7c0f67 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -661,10 +661,10 @@
* with a hashtable) and sn_var_vals (lookup by index).
* When "create" is TRUE this is a new variable, otherwise find and update an
* existing variable.
- * When "type" is NULL use "tv" for the type.
+ * When "*type" is NULL use "tv" for the type and update "*type".
*/
void
-update_vim9_script_var(int create, dictitem_T *di, typval_T *tv, type_T *type)
+update_vim9_script_var(int create, dictitem_T *di, typval_T *tv, type_T **type)
{
scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid);
hashitem_T *hi;
@@ -715,10 +715,9 @@
}
if (sv != NULL)
{
- if (type == NULL)
- sv->sv_type = typval2type(tv, &si->sn_type_list);
- else
- sv->sv_type = type;
+ if (*type == NULL)
+ *type = typval2type(tv, &si->sn_type_list);
+ sv->sv_type = *type;
}
// let ex_export() know the export worked.