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:
zeertzjq 2024-01-16 09:32:57 +08:00 committed by GitHub
parent 73e1942abe
commit a34451982f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions

View File

@ -1095,17 +1095,19 @@ bool is_compatht(const hashtab_T *ht)
} }
/// Prepare v: variable "idx" to be used. /// 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. /// When not used yet add the variable to the v: hashtable.
void prepare_vimvar(int idx, typval_T *save_tv) void prepare_vimvar(int idx, typval_T *save_tv)
{ {
*save_tv = vimvars[idx].vv_tv; *save_tv = vimvars[idx].vv_tv;
vimvars[idx].vv_str = NULL; // don't free it now
if (vimvars[idx].vv_type == VAR_UNKNOWN) { if (vimvars[idx].vv_type == VAR_UNKNOWN) {
hash_add(&vimvarht, vimvars[idx].vv_di.di_key); hash_add(&vimvarht, vimvars[idx].vv_di.di_key);
} }
} }
/// Restore v: variable "idx" to typeval "save_tv". /// 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. /// When no longer defined, remove the variable from the v: hashtable.
void restore_vimvar(int idx, typval_T *save_tv) void restore_vimvar(int idx, typval_T *save_tv)
{ {

View File

@ -56,6 +56,15 @@ func Test_filter_map_list_expr_funcref()
call assert_equal([0, 2, 4, 6], map([1, 2, 3, 4], function('s:filter4'))) call assert_equal([0, 2, 4, 6], map([1, 2, 3, 4], function('s:filter4')))
endfunc endfunc
func Test_filter_map_nested()
let x = {"x":10}
let r = map(range(2), 'filter(copy(x), "1")')
call assert_equal([x, x], r)
let r = map(copy(x), 'filter(copy(x), "1")')
call assert_equal({"x": x}, r)
endfunc
" dict with funcref " dict with funcref
func Test_filter_map_dict_expr_funcref() func Test_filter_map_dict_expr_funcref()
let dict = {"foo": 1, "bar": 2, "baz": 3} let dict = {"foo": 1, "bar": 2, "baz": 3}

View File

@ -2671,6 +2671,10 @@ func Test_readdir()
let files = readdir('Xdir', {x -> len(add(l, x)) == 2 ? -1 : 1}) let files = readdir('Xdir', {x -> len(add(l, x)) == 2 ? -1 : 1})
call assert_equal(1, len(files)) call assert_equal(1, len(files))
" Nested readdir() must not crash
let files = readdir('Xdir', 'readdir("Xdir", "1") != []')
call sort(files)->assert_equal(['bar.txt', 'dir', 'foo.txt'])
eval 'Xdir'->delete('rf') eval 'Xdir'->delete('rf')
endfunc endfunc