mirror of
https://github.com/neovim/neovim.git
synced 2025-10-04 00:46:30 +00:00
vim-patch:8.1.1968: crash when using nested map() (#27029)
Problem: Crash when using nested map().
Solution: Clear the pointer in prepare_vimvar(). (Ozaki Kiichi,
closes vim/vim#4890, closes vim/vim#4891)
27da7de7c5
Cherry-pick Test_filter_map_nested() from patch 8.1.1964.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
@@ -1095,17 +1095,19 @@ bool is_compatht(const hashtab_T *ht)
|
||||
}
|
||||
|
||||
/// Prepare v: variable "idx" to be used.
|
||||
/// Save the current typeval in "save_tv".
|
||||
/// Save the current typeval in "save_tv" and clear it.
|
||||
/// When not used yet add the variable to the v: hashtable.
|
||||
void prepare_vimvar(int idx, typval_T *save_tv)
|
||||
{
|
||||
*save_tv = vimvars[idx].vv_tv;
|
||||
vimvars[idx].vv_str = NULL; // don't free it now
|
||||
if (vimvars[idx].vv_type == VAR_UNKNOWN) {
|
||||
hash_add(&vimvarht, vimvars[idx].vv_di.di_key);
|
||||
}
|
||||
}
|
||||
|
||||
/// Restore v: variable "idx" to typeval "save_tv".
|
||||
/// Note that the v: variable must have been cleared already.
|
||||
/// When no longer defined, remove the variable from the v: hashtable.
|
||||
void restore_vimvar(int idx, typval_T *save_tv)
|
||||
{
|
||||
|
Reference in New Issue
Block a user