summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-07-23 06:53:08 +0100
committerBram Moolenaar <Bram@vim.org>2022-07-23 06:53:08 +0100
commitb9e717367c395490149495cf375911b5d9de889e (patch)
tree6d0f1e6de40c0e71f8371e7ba82f401583fd1452
parentbb404f5ad5ec909318bc24e5b82e4ed7b87ba8f4 (diff)
patch 9.0.0060: accessing uninitialized memory when completing long linev9.0.0060
Problem: Accessing uninitialized memory when completing long line. Solution: Terminate string with NUL.
-rw-r--r--src/insexpand.c1
-rw-r--r--src/testdir/test_ins_complete.vim7
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/src/insexpand.c b/src/insexpand.c
index b49a631a6b..c505158a1d 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -642,6 +642,7 @@ ins_compl_infercase_gettext(
// growarray. Add the character in the next round.
if (ga_grow(&gap, IOSIZE) == FAIL)
return (char_u *)"[failed]";
+ *p = NUL;
STRCPY(gap.ga_data, IObuff);
gap.ga_len = (int)STRLEN(IObuff);
}
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 2be6d06020..7bebc5d8a9 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -2108,6 +2108,13 @@ func Test_infercase_very_long_line()
exe "normal 2Go\<C-X>\<C-L>\<Esc>"
call assert_equal(longLine, getline(3))
+ " check that the too long text is NUL terminated
+ %del
+ norm o
+ norm 1987ax
+ exec "norm ox\<C-X>\<C-L>"
+ call assert_equal(repeat('x', 1987), getline(3))
+
bwipe!
set noic noinfercase
endfunc
diff --git a/src/version.c b/src/version.c
index b57ab6985f..b6e61f50ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 60,
+/**/
59,
/**/
58,