neovim

commit 4ffe5d018919d3fbea21e667f09f14b9751f9cd5
parent 664efa497e4e3d79d2e4ab486acbf1471b2389b0
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Thu,  7 Jul 2022 06:37:54 +0800

vim-patch:8.2.5063: error for a command may go over the end of IObuff (#19260)

Problem:    Error for a command may go over the end of IObuff.
Solution:   Truncate the message.
https://github.com/vim/vim/commit/44a3f3353e0407e9fffee138125a6927d1c9e7e5
Diffstat:
M
src/nvim/ex_docmd.c
 | 
7
+++++++
M
src/nvim/testdir/test_cmdline.vim
 | 
5
+++++

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
@@ -2904,9 +2904,16 @@ int checkforcmd(char **pp, char *cmd, int len)
 /// invisible otherwise.
 static void append_command(char *cmd)
 {
+  size_t len = STRLEN(IObuff);
   char *s = cmd;
   char *d;
 
+  if (len > IOSIZE - 100) {
+    // Not enough space, truncate and put in "...".
+    d = (char *)IObuff + IOSIZE - 100;
+    d -= utf_head_off(IObuff, (const char_u *)d);
+    STRCPY(d, "...");
+  }
   STRCAT(IObuff, ": ");
   d = (char *)IObuff + STRLEN(IObuff);
   while (*s != NUL && (char_u *)d - IObuff + 5 < IOSIZE) {
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
@@ -1361,4 +1361,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