# HG changeset patch # User Bram Moolenaar # Date 1648488603 -7200 # Node ID e31f1a949d4ea54fd59dc41067cd327c26b409c9 # Parent d041bcc0d3d639a7ddd775bc8b1a07f8a7308ba5 patch 8.2.4643: Vim9: variable may be locked unintentionally Commit: https://github.com/vim/vim/commit/24565cf27bc28cbd73f10e5ddf1e4ef53038a426 Author: Bram Moolenaar Date: Mon Mar 28 18:16:52 2022 +0100 patch 8.2.4643: Vim9: variable may be locked unintentionally Problem: Vim9: variable may be locked unintentionally. Solution: Clear "v_lock". (closes https://github.com/vim/vim/issues/10036) diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -371,10 +371,17 @@ def Test_bufname() assert_fails('bufname([])', 'E1220:') enddef +let s:bufnr_res = 0 + def Test_bufnr() var buf = bufnr() bufnr('%')->assert_equal(buf) + # check the lock is not taken over through the stack + const nr = 10 + bufnr_res = bufnr() + bufnr_res = 12345 + buf = bufnr('Xdummy', true) buf->assert_notequal(-1) exe 'bwipe! ' .. buf diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4643, +/**/ 4642, /**/ 4641, diff --git a/src/vim9execute.c b/src/vim9execute.c --- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -937,6 +937,7 @@ call_prepare(int argcount, typval_T *arg tv = STACK_TV_BOT(-1); tv->v_type = VAR_NUMBER; tv->vval.v_number = 0; + tv->v_lock = 0; return OK; }