55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From c6fdb15d423df22e1776844811d082322475e48a Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Sat, 2 Jul 2022 13:43:21 +0100
|
|
Subject: [PATCH] patch 9.0.0025: accessing beyond allocated memory with the
|
|
cmdline window
|
|
|
|
Problem: Accessing beyond allocated memory when using the cmdline window in
|
|
Ex mode.
|
|
Solution: Use "*" instead of "'<,'>" for Visual mode.
|
|
---
|
|
src/ex_docmd.c | 6 ++++--
|
|
src/testdir/test_cmdline.vim | 8 ++++++++
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
|
|
index 271e7e2..697337c 100644
|
|
--- a/src/ex_docmd.c
|
|
+++ b/src/ex_docmd.c
|
|
@@ -3118,9 +3118,11 @@ parse_command_modifiers(
|
|
size_t len = STRLEN(cmd_start);
|
|
|
|
// Special case: empty command uses "+":
|
|
- // "'<,'>mods" -> "mods'<,'>+
|
|
+ // "'<,'>mods" -> "mods *+
|
|
+ // Use "*" instead of "'<,'>" to avoid the command getting
|
|
+ // longer, in case is was allocated.
|
|
mch_memmove(orig_cmd, cmd_start, len);
|
|
- STRCPY(orig_cmd + len, "'<,'>+");
|
|
+ STRCPY(orig_cmd + len, " *+");
|
|
}
|
|
else
|
|
{
|
|
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
|
|
index 3685336..f0498a1 100644
|
|
--- a/src/testdir/test_cmdline.vim
|
|
+++ b/src/testdir/test_cmdline.vim
|
|
@@ -2103,6 +2103,14 @@ func Test_cmdwin_insert_mode_close()
|
|
call assert_equal(1, winnr('$'))
|
|
endfunc
|
|
|
|
+func Test_cmdwin_ex_mode_with_modifier()
|
|
+ " this was accessing memory after allocated text in Ex mode
|
|
+ new
|
|
+ call setline(1, ['some', 'text', 'lines'])
|
|
+ silent! call feedkeys("gQnormal vq:atopleft\<C-V>\<CR>\<CR>", 'xt')
|
|
+ bwipe!
|
|
+endfunc
|
|
+
|
|
" test that ";" works to find a match at the start of the first line
|
|
func Test_zero_line_search()
|
|
new
|
|
--
|
|
1.8.3.1
|
|
|