neovim

commit 2de12e9bd7fe72eb4656a3c0f689caf6ce971451
parent df2c3b204b9622687d0cd7dd59cbd3f89d9383ce
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri, 31 May 2024 05:50:57 +0800

vim-patch:9.1.0451: No test for escaping '<' with shellescape()

Problem:  No test for escaping '<' with shellescape()
Solution: Add a test.  Use memcpy() in code to make it easier to
          understand.  Fix a typo (zeertzjq).

closes: vim/vim#14876

https://github.com/vim/vim/commit/88c8c547d5fc380e5685c2b01ec564ccdf9b259a

Diffstat:
M
src/nvim/search.h
 | 
2
+-
M
src/nvim/strings.c
 | 
8
++++----
M
test/old/testdir/test_shell.vim
 | 
4
++++

3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/nvim/search.h b/src/nvim/search.h
@@ -84,7 +84,7 @@ typedef struct {
 /// Structure containing last search pattern and its attributes.
 typedef struct {
   char *pat;            ///< The pattern (in allocated memory) or NULL.
-  size_t patlen;        ///< The length of the patten (0 is pat is NULL).
+  size_t patlen;        ///< The length of the pattern (0 if pat is NULL).
   bool magic;           ///< Magicness of the pattern.
   bool no_scs;          ///< No smartcase for this pattern.
   Timestamp timestamp;  ///< Time of the last change.
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
@@ -266,11 +266,11 @@ char *vim_strsave_shellescape(const char *string, bool do_special, bool do_newli
       *d++ = *p++;
       continue;
     }
-    if (do_special && find_cmdline_var(p, &l) >= 0 && l > 0) {
+    if (do_special && find_cmdline_var(p, &l) >= 0) {
       *d++ = '\\';                    // insert backslash
-      do {  // copy the var
-        *d++ = *p++;
-      } while (--l > 0);
+      memcpy(d, p, l);                // copy the var
+      d += l;
+      p += l;
       continue;
     }
     if (*p == '\\' && fish_like) {
diff --git a/test/old/testdir/test_shell.vim b/test/old/testdir/test_shell.vim
@@ -119,6 +119,10 @@ func Test_shellescape()
   call assert_equal("'te\\#xt'", shellescape("te#xt", 1))
   call assert_equal("'te!xt'", shellescape("te!xt"))
   call assert_equal("'te\\!xt'", shellescape("te!xt", 1))
+  call assert_equal("'te<cword>xt'", shellescape("te<cword>xt"))
+  call assert_equal("'te\\<cword>xt'", shellescape("te<cword>xt", 1))
+  call assert_equal("'te<cword>%xt'", shellescape("te<cword>%xt"))
+  call assert_equal("'te\\<cword>\\%xt'", shellescape("te<cword>%xt", 1))
 
   call assert_equal("'te\nxt'", shellescape("te\nxt"))
   call assert_equal("'te\\\nxt'", shellescape("te\nxt", 1))