Mercurial > vim
diff src/vim9script.c @ 23458:d2b1269c2c68 v8.2.2272
patch 8.2.2272: Vim9: extend() can violate the type of a variable
Commit: https://github.com/vim/vim/commit/aa210a3aeccc33c6051978017959126b037f94af
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 2 15:41:03 2021 +0100
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 02 Jan 2021 15:45:04 +0100 |
| parents | 517fca70e084 |
| children | 85ce241ff9e3 |
line wrap: on
line diff
--- a/src/vim9script.c +++ b/src/vim9script.c @@ -661,10 +661,10 @@ vim9_declare_scriptvar(exarg_T *eap, cha * 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 @@ update_vim9_script_var(int create, dicti } 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.