Mercurial > vim
diff src/dict.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 | 657216220293 |
children | 6bfb302d8392 |
line wrap: on
line diff
--- a/src/dict.c +++ b/src/dict.c @@ -107,6 +107,8 @@ rettv_dict_set(typval_T *rettv, dict_T * dict_free_contents(dict_T *d) { hashtab_free_contents(&d->dv_hashtab); + free_type(d->dv_type); + d->dv_type = NULL; } /* @@ -1057,6 +1059,12 @@ dict_extend(dict_T *d1, dict_T *d2, char hashitem_T *hi2; int todo; char_u *arg_errmsg = (char_u *)N_("extend() argument"); + type_T *type; + + if (d1->dv_type != NULL && d1->dv_type->tt_member != NULL) + type = d1->dv_type->tt_member; + else + type = NULL; todo = (int)d2->dv_hashtab.ht_used; for (hi2 = d2->dv_hashtab.ht_array; todo > 0; ++hi2) @@ -1076,6 +1084,11 @@ dict_extend(dict_T *d1, dict_T *d2, char if (!valid_varname(hi2->hi_key, TRUE)) break; } + + if (type != NULL + && check_typval_type(type, &HI2DI(hi2)->di_tv, 0) == FAIL) + break; + if (di1 == NULL) { di1 = dictitem_copy(HI2DI(hi2));