aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.5063: error for a command may go over the end of IObuff

Browse Source 
Problem:    Error for a command may go over the end of IObuff.
Solution:   Truncate the message.
This commit is contained in:
Bram Moolenaar
2022-06-06 15:38:21 +01:00
parent 1f89abf69d
commit 44a3f3353e
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ex_docmd.c
View File

@@ -3441,9 +3441,17 @@ theend:
static void static void
append_command(char_u *cmd) append_command(char_u *cmd)
{ {
size_t len = STRLEN(IObuff);
char_u *s = cmd; char_u *s = cmd;
char_u *d; char_u *d;
if (len > IOSIZE - 100)
{
// Not enough space, truncate and put in "...".
d = IObuff + IOSIZE - 100;
d -= mb_head_off(IObuff, d);
STRCPY(d, "...");
}
STRCAT(IObuff, ": "); STRCAT(IObuff, ": ");
d = IObuff + STRLEN(IObuff); d = IObuff + STRLEN(IObuff);
while (*s != NUL && d - IObuff + 5 < IOSIZE) while (*s != NUL && d - IObuff + 5 < IOSIZE)

5
src/testdir/test_cmdline.vim
View File

@@ -3413,4 +3413,9 @@ func Test_recursive_register()
call assert_equal('yes', caught) call assert_equal('yes', caught)
endfunc endfunc
func Test_long_error_message()
" the error should be truncated, not overrun IObuff
silent! norm Q00000000000000     000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000                                                                                                                                                                                                                        
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5063,
/**/ /**/
5062, 5062,
/**/ /**/