summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/message.c2
-rw-r--r--src/testdir/test_crash.vim7
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index 2fc6cefa9d..83c8b4f4a0 100644
--- a/src/message.c
+++ b/src/message.c
@@ -353,7 +353,7 @@ trunc_string(
else
{
// can't fit in the "...", just truncate it
- buf[e - 1] = NUL;
+ buf[buflen - 1] = NUL;
}
}
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index a1da68ed4c..5c83e3a2f5 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -66,6 +66,12 @@ func Test_crash1()
\ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>")
call TermWait(buf, 3000)
+ let file = 'crash/vim_msg_trunc_poc'
+ let args = printf(cmn_args, vim, file)
+ call term_sendkeys(buf, args ..
+ \ ' || echo "crash 8: [OK]" >> X_crash1_result.txt' .. "\<cr>")
+ call TermWait(buf, 3000)
+
" clean up
exe buf .. "bw!"
@@ -79,6 +85,7 @@ func Test_crash1()
\ 'crash 5: [OK]',
\ 'crash 6: [OK]',
\ 'crash 7: [OK]',
+ \ 'crash 8: [OK]',
\ ]
call assert_equal(expected, getline(1, '$'))
diff --git a/src/version.c b/src/version.c
index 1be1462768..3056f35d7f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1969,
+/**/
1968,
/**/
1967,