aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1135: Vim9: getting a dict member may not work

Browse Source 
Problem:    Vim9: getting a dict member may not work.
Solution:   Clear the dict only after copying the item.
This commit is contained in:
Bram Moolenaar
2020-07-05 16:51:26 +02:00
parent 435d89789e
commit 50788ef349
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vim9execute.c
View File

@@ -2166,6 +2166,7 @@ call_def_function(
dict_T *dict;
char_u *key;
dictitem_T *di;
typval_T temp_tv;
// dict member: dict is at stack-2, key at stack-1
tv = STACK_TV_BOT(-2);
@@ -2181,10 +2182,14 @@ call_def_function(
semsg(_(e_dictkey), key);
goto failed;
}
--ectx.ec_stack.ga_len;
clear_tv(tv);
clear_tv(STACK_TV_BOT(-1));
copy_tv(&di->di_tv, STACK_TV_BOT(-1));
--ectx.ec_stack.ga_len;
// Clear the dict after getting the item, to avoid that it
// make the item invalid.
tv = STACK_TV_BOT(-1);
temp_tv = *tv;
copy_tv(&di->di_tv, tv);
clear_tv(&temp_tv);
}
break;