diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-29 20:09:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-29 20:09:36 +0200 |
| commit | fda20c4cc59008264676a6deb6a3095ed0c248e0 (patch) | |
| tree | 97f092b03a498eab1d3c063bb283980ceb2d76db | |
| parent | 91639195eff7b29213a0a3c279ac46e46ac76edd (diff) | |
patch 8.2.1083: crash when using reduce() on a NULL listv8.2.1083
Problem: Crash when using reduce() on a NULL list.
Solution: Only access the list when not NULL.
| -rw-r--r-- | src/list.c | 31 | ||||
| -rw-r--r-- | src/testdir/test_listdict.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 23 insertions, 13 deletions
diff --git a/src/list.c b/src/list.c index 56ed5fcdb6..ffcffa9f0c 100644 --- a/src/list.c +++ b/src/list.c @@ -2475,10 +2475,10 @@ f_reduce(typval_T *argvars, typval_T *rettv) list_T *l = argvars[0].vval.v_list; listitem_T *li = NULL; int r; - int prev_locked = l->lv_lock; int called_emsg_start = called_emsg; - CHECK_LIST_MATERIALIZE(l); + if (l != NULL) + CHECK_LIST_MATERIALIZE(l); if (argvars[2].v_type == VAR_UNKNOWN) { if (l == NULL || l->lv_first == NULL) @@ -2495,20 +2495,25 @@ f_reduce(typval_T *argvars, typval_T *rettv) if (l != NULL) li = l->lv_first; } - - l->lv_lock = VAR_FIXED; // disallow the list changing here copy_tv(&initial, rettv); - for ( ; li != NULL; li = li->li_next) + + if (l != NULL) { - argv[0] = *rettv; - argv[1] = li->li_tv; - rettv->v_type = VAR_UNKNOWN; - r = call_func(func_name, -1, rettv, 2, argv, &funcexe); - clear_tv(&argv[0]); - if (r == FAIL || called_emsg != called_emsg_start) - break; + int prev_locked = l->lv_lock; + + l->lv_lock = VAR_FIXED; // disallow the list changing here + for ( ; li != NULL; li = li->li_next) + { + argv[0] = *rettv; + argv[1] = li->li_tv; + rettv->v_type = VAR_UNKNOWN; + r = call_func(func_name, -1, rettv, 2, argv, &funcexe); + clear_tv(&argv[0]); + if (r == FAIL || called_emsg != called_emsg_start) + break; + } + l->lv_lock = prev_locked; } - l->lv_lock = prev_locked; } else { diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim index 26b0e91e03..8a8d353289 100644 --- a/src/testdir/test_listdict.vim +++ b/src/testdir/test_listdict.vim @@ -718,6 +718,9 @@ func Test_reduce() call assert_fails("call reduce(g:lut, { acc, val -> EvilRemove() }, 1)", 'E742:') unlet g:lut delfunc EvilRemove + + call assert_equal(42, reduce(test_null_list(), function('add'), 42)) + call assert_equal(42, reduce(test_null_blob(), function('add'), 42)) endfunc " splitting a string to a List using split() diff --git a/src/version.c b/src/version.c index 9806b91f6a..2ffa111479 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1083, +/**/ 1082, /**/ 1081, |