Mercurial > vim
changeset 26891:902b8bee5254 v8.2.3974
patch 8.2.3974: Vim9: LISTAPPEND instruction does not check for a locked list
Commit: https://github.com/vim/vim/commit/1f4a3457a3e55cdacd70ab0d5be587c248fb1ce8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 1 18:29:21 2022 +0000
patch 8.2.3974: Vim9: LISTAPPEND instruction does not check for a locked list
Problem: Vim9: LISTAPPEND instruction does not check for a locked list.
Solution: Check whether the list is locked. (closes https://github.com/vim/vim/issues/9452)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 01 Jan 2022 19:30:03 +0100 |
| parents | 453f8cb05fab |
| children | 71e7c936307f |
| files | src/testdir/test_vim9_builtin.vim src/version.c src/vim9execute.c |
| diffstat | 3 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -78,6 +78,17 @@ enddef def Test_add() CheckDefAndScriptFailure(['add({}, 1)'], ['E1013: Argument 1: type mismatch, expected list<any> but got dict<unknown>', 'E1226: List or Blob required for argument 1']) CheckDefFailure(['add([1], "a")'], 'E1012: Type mismatch; expected number but got string') + + var lines =<< trim END + vim9script + g:thelist = [1] + lockvar g:thelist + def TryChange() + g:thelist->add(2) + enddef + TryChange() + END + CheckScriptFailure(lines, 'E741:') enddef def Test_add_blob()
--- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3974, +/**/ 3973, /**/ 3972,
--- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -3911,12 +3911,14 @@ exec_instructions(ectx_T *ectx) list_T *l = tv1->vval.v_list; // add an item to a list + SOURCING_LNUM = iptr->isn_lnum; if (l == NULL) { - SOURCING_LNUM = iptr->isn_lnum; emsg(_(e_cannot_add_to_null_list)); goto on_error; } + if (value_check_lock(l->lv_lock, NULL, FALSE)) + goto on_error; if (list_append_tv(l, tv2) == FAIL) goto theend; clear_tv(tv2);