Mercurial > vim
changeset 17936:7f3283683d97 v8.1.1964
patch 8.1.1964: crash when using nested map() and filter()
Commit: https://github.com/vim/vim/commit/c36350bca3eed8ef97061e28c38b5b89cae1f13e
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 2 20:44:07 2019 +0200
patch 8.1.1964: crash when using nested map() and filter()
Problem: Crash when using nested map() and filter().
Solution: Do not set the v:key type to string without clearing the pointer.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 02 Sep 2019 20:45:04 +0200 |
| parents | c539b7a1fda0 |
| children | 846f904817c0 |
| files | src/eval.c src/testdir/test_filter_map.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -7185,8 +7185,6 @@ filter_map(typval_T *argvars, typval_T * hashtab_T *ht; hashitem_T *hi; dict_T *d = NULL; - typval_T save_val; - typval_T save_key; blob_T *b = NULL; int rem; int todo; @@ -7225,18 +7223,19 @@ filter_map(typval_T *argvars, typval_T * * was not passed as argument. */ if (expr->v_type != VAR_UNKNOWN) { + typval_T save_val; + typval_T save_key; + prepare_vimvar(VV_VAL, &save_val); - - /* We reset "did_emsg" to be able to detect whether an error - * occurred during evaluation of the expression. */ + prepare_vimvar(VV_KEY, &save_key); + + // We reset "did_emsg" to be able to detect whether an error + // occurred during evaluation of the expression. save_did_emsg = did_emsg; did_emsg = FALSE; - prepare_vimvar(VV_KEY, &save_key); if (argvars[0].v_type == VAR_DICT) { - set_vim_var_type(VV_KEY, VAR_STRING); - ht = &d->dv_hashtab; hash_lock(ht); todo = (int)ht->ht_used; @@ -7274,7 +7273,9 @@ filter_map(typval_T *argvars, typval_T * int i; typval_T tv; + // set_vim_var_nr() doesn't set the type set_vim_var_type(VV_KEY, VAR_NUMBER); + for (i = 0; i < b->bv_ga.ga_len; i++) { tv.v_type = VAR_NUMBER; @@ -7285,7 +7286,7 @@ filter_map(typval_T *argvars, typval_T * if (tv.v_type != VAR_NUMBER) { emsg(_(e_invalblob)); - return; + break; } tv.v_type = VAR_NUMBER; blob_set(b, i, tv.vval.v_number); @@ -7300,9 +7301,9 @@ filter_map(typval_T *argvars, typval_T * } } } - else - { - // argvars[0].v_type == VAR_LIST + else // argvars[0].v_type == VAR_LIST + { + // set_vim_var_nr() doesn't set the type set_vim_var_type(VV_KEY, VAR_NUMBER); for (li = l->lv_first; li != NULL; li = nli)
--- a/src/testdir/test_filter_map.vim +++ b/src/testdir/test_filter_map.vim @@ -53,6 +53,12 @@ func Test_filter_map_list_expr_funcref() call assert_equal([0, 2, 4, 6], map([1, 2, 3, 4], function('s:filter4'))) 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) +endfunc + " dict with funcref func Test_filter_map_dict_expr_funcref() let dict = {"foo": 1, "bar": 2, "baz": 3}