50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
|
From 85b6747abc15a7a81086db31289cf1b8b17e6cb1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bram Moolenaar <Bram@vim.org>
|
||
|
|
Date: Tue, 25 Jan 2022 11:55:02 +0000
|
||
|
|
Subject: [PATCH] patch 8.2.4214: illegal memory access with large 'tabstop' in
|
||
|
|
Ex mode
|
||
|
|
|
||
|
|
Problem: Illegal memory access with large 'tabstop' in Ex mode.
|
||
|
|
Solution: Allocate enough memory.
|
||
|
|
---
|
||
|
|
src/ex_getln.c | 2 +-
|
||
|
|
src/testdir/test_ex_mode.vim | 10 ++++++++++
|
||
|
|
src/version.c | 2 ++
|
||
|
|
3 files changed, 13 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/ex_getln.c b/src/ex_getln.c
|
||
|
|
index 5dc43d845..097b97eeb 100644
|
||
|
|
--- a/src/ex_getln.c
|
||
|
|
+++ b/src/ex_getln.c
|
||
|
|
@@ -1513,7 +1513,7 @@ init_ccline(int firstc, int indent)
|
||
|
|
ccline.cmdindent = (firstc > 0 ? indent : 0);
|
||
|
|
|
||
|
|
// alloc initial ccline.cmdbuff
|
||
|
|
- alloc_cmdbuff(exmode_active ? 250 : indent + 1);
|
||
|
|
+ alloc_cmdbuff(indent + 50);
|
||
|
|
if (ccline.cmdbuff == NULL)
|
||
|
|
return FAIL;
|
||
|
|
ccline.cmdlen = ccline.cmdpos = 0;
|
||
|
|
diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
|
||
|
|
index 7031115fc..2642a16d2 100644
|
||
|
|
--- a/src/testdir/test_ex_mode.vim
|
||
|
|
+++ b/src/testdir/test_ex_mode.vim
|
||
|
|
@@ -241,4 +241,14 @@ func Test_ex_mode_count_overflow()
|
||
|
|
call delete('Xexmodescript')
|
||
|
|
endfunc
|
||
|
|
|
||
|
|
+func Test_ex_mode_large_indent()
|
||
|
|
+ new
|
||
|
|
+ set ts=500 ai
|
||
|
|
+ call setline(1, "\t")
|
||
|
|
+ exe "normal gQi\<CR>."
|
||
|
|
+ set ts=8 noai
|
||
|
|
+ bwipe!
|
||
|
|
+endfunc
|
||
|
|
+
|
||
|
|
+
|
||
|
|
" vim: shiftwidth=2 sts=2 expandtab
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|