diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-03 17:13:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-03 17:13:37 +0200 |
| commit | 27da7de7c547dbf983ed7dd901ea59be4e7c9ab2 (patch) | |
| tree | 226eb4e666308f35d8869ceabbb225fcaf741b06 | |
| parent | 8e0a8e7eb7c177807f44db6b76d8e52314248ab5 (diff) | |
| download | vim-git-27da7de7c547dbf983ed7dd901ea59be4e7c9ab2.tar.gz | |
patch 8.1.1968: crash when using nested map()v8.1.1968
Problem: Crash when using nested map().
Solution: Clear the pointer in prepare_vimvar(). (Ozaki Kiichi,
closes #4890, closes #4891)
| -rw-r--r-- | src/evalvars.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_filter_map.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index e6fb3d898..9e1a24d3f 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -489,19 +489,21 @@ get_spellword(list_T *list, char_u **pp) /* * 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 diff --git a/src/testdir/test_filter_map.vim b/src/testdir/test_filter_map.vim index 72a8d841e..e144538de 100644 --- a/src/testdir/test_filter_map.vim +++ b/src/testdir/test_filter_map.vim @@ -57,6 +57,9 @@ 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 diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 6984c23cc..20718bcc0 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1543,6 +1543,10 @@ func Test_readdir() let files = readdir('Xdir', {x -> len(add(l, x)) == 2 ? -1 : 1}) 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') endfunc diff --git a/src/version.c b/src/version.c index f5c9eec87..5dbdc9fa4 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1968, +/**/ 1967, /**/ 1966, |