aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.0211: invalid memory access when compiling :lockvar

Browse Source 
Problem:    Invalid memory access when compiling :lockvar.
Solution:   Don't read past the end of the line.
This commit is contained in:
Bram Moolenaar
2022-08-14 21:28:32 +01:00
parent c3a483fc3c
commit d1d8f6bacb
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/testdir/test_vim9_cmd.vim
View File

@@ -1737,6 +1737,15 @@ def Test_lockvar()
UnLockIt() UnLockIt()
END END
v9.CheckScriptFailure(lines, 'E46', 1) v9.CheckScriptFailure(lines, 'E46', 1)
lines =<< trim END
def _()
s:0([], s:0)
lockv
enddef
defcomp
END
v9.CheckScriptFailure(lines, 'E179', 2)
enddef enddef
def Test_substitute_expr() def Test_substitute_expr()

2
src/version.c
View File

@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
211,
/**/ /**/
210, 210,
/**/ /**/

9
src/vim9cmds.c
View File

@@ -188,10 +188,17 @@ compile_lock_unlock(
size_t len; size_t len;
char_u *buf; char_u *buf;
isntype_T isn = ISN_EXEC; isntype_T isn = ISN_EXEC;
char *cmd = eap->cmdidx == CMD_lockvar ? "lockvar" : "unlockvar";
if (cctx->ctx_skip == SKIP_YES) if (cctx->ctx_skip == SKIP_YES)
return OK; return OK;
if (*p == NUL)
{
semsg(_(e_argument_required_for_str), cmd);
return FAIL;
}
// Cannot use :lockvar and :unlockvar on local variables. // Cannot use :lockvar and :unlockvar on local variables.
if (p[1] != ':') if (p[1] != ':')
{ {
@@ -223,8 +230,6 @@ compile_lock_unlock(
ret = FAIL; ret = FAIL;
else else
{ {
char *cmd = eap->cmdidx == CMD_lockvar ? "lockvar" : "unlockvar";
if (deep < 0) if (deep < 0)
vim_snprintf((char *)buf, len, "%s! %s", cmd, p); vim_snprintf((char *)buf, len, "%s! %s", cmd, p);
else else