Skip to content

Commit

Permalink
patch 8.2.5063: error for a command may go over the end of IObuff
Browse files Browse the repository at this point in the history
Problem:    Error for a command may go over the end of IObuff.
Solution:   Truncate the message.
  • Loading branch information
brammool committed Jun 6, 2022
1 parent 1f89abf commit 44a3f33
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/ex_docmd.c
Expand Up @@ -3441,9 +3441,17 @@ parse_cmd_address(exarg_T *eap, char **errormsg, int silent)
static void
append_command(char_u *cmd)
{
char_u *s = cmd;
char_u *d;
size_t len = STRLEN(IObuff);
char_u *s = cmd;
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, ": ");
d = IObuff + STRLEN(IObuff);
while (*s != NUL && d - IObuff + 5 < IOSIZE)
Expand Down
5 changes: 5 additions & 0 deletions src/testdir/test_cmdline.vim
Expand Up @@ -3413,4 +3413,9 @@ func Test_recursive_register()
call assert_equal('yes', caught)
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
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -734,6 +734,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
5063,
/**/
5062,
/**/
Expand Down

0 comments on commit 44a3f33

Please sign in to comment.