67 lines
1.7 KiB
Diff
67 lines
1.7 KiB
Diff
From d1d8f6bacb489036d0fd479c9dd3c0102c988889 Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Sun, 14 Aug 2022 21:28:32 +0100
|
|
Subject: [PATCH] patch 9.0.0211: invalid memory access when compiling :lockvar
|
|
|
|
Problem: Invalid memory access when compiling :lockvar.
|
|
Solution: Don't read past the end of the line.
|
|
---
|
|
src/testdir/test_vim9_cmd.vim | 9 +++++++++
|
|
src/vim9cmds.c | 9 +++++++--
|
|
2 files changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
|
|
index 7db8e50..16f534e 100644
|
|
--- a/src/testdir/test_vim9_cmd.vim
|
|
+++ b/src/testdir/test_vim9_cmd.vim
|
|
@@ -1701,6 +1701,15 @@ def Test_lockvar()
|
|
UnLockIt()
|
|
END
|
|
v9.CheckScriptFailure(lines, 'E46', 1)
|
|
+
|
|
+ lines =<< trim END
|
|
+ def _()
|
|
+ s:0([], s:0)
|
|
+ lockv
|
|
+ enddef
|
|
+ defcomp
|
|
+ END
|
|
+ v9.CheckScriptFailure(lines, 'E179', 2)
|
|
enddef
|
|
|
|
def Test_substitute_expr()
|
|
diff --git a/src/vim9cmds.c b/src/vim9cmds.c
|
|
index ad32c32..35a3821 100644
|
|
--- a/src/vim9cmds.c
|
|
+++ b/src/vim9cmds.c
|
|
@@ -188,10 +188,17 @@ compile_lock_unlock(
|
|
size_t len;
|
|
char_u *buf;
|
|
isntype_T isn = ISN_EXEC;
|
|
+ char *cmd = eap->cmdidx == CMD_lockvar ? "lockvar" : "unlockvar";
|
|
|
|
if (cctx->ctx_skip == SKIP_YES)
|
|
return OK;
|
|
|
|
+ if (*p == NUL)
|
|
+ {
|
|
+ semsg(_(e_argument_required_for_str), cmd);
|
|
+ return FAIL;
|
|
+ }
|
|
+
|
|
// Cannot use :lockvar and :unlockvar on local variables.
|
|
if (p[1] != ':')
|
|
{
|
|
@@ -223,8 +230,6 @@ compile_lock_unlock(
|
|
ret = FAIL;
|
|
else
|
|
{
|
|
- char *cmd = eap->cmdidx == CMD_lockvar ? "lockvar" : "unlockvar";
|
|
-
|
|
if (deep < 0)
|
|
vim_snprintf((char *)buf, len, "%s! %s", cmd, p);
|
|
else
|
|
--
|
|
2.36.1
|
|
|