mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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

88c8c547d5
This commit is contained in:
zeertzjq
2024-05-31 05:50:57 +08:00
parent df2c3b204b
commit 2de12e9bd7
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/search.h
View File

@@ -84,7 +84,7 @@ typedef struct {
/// Structure containing last search pattern and its attributes. /// Structure containing last search pattern and its attributes.
typedef struct { typedef struct {
char *pat; ///< The pattern (in allocated memory) or NULL. 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 magic; ///< Magicness of the pattern.
bool no_scs; ///< No smartcase for this pattern. bool no_scs; ///< No smartcase for this pattern.
Timestamp timestamp; ///< Time of the last change. Timestamp timestamp; ///< Time of the last change.

8
src/nvim/strings.c
View File

@@ -266,11 +266,11 @@ char *vim_strsave_shellescape(const char *string, bool do_special, bool do_newli
*d++ = *p++; *d++ = *p++;
continue; continue;
} }
if (do_special && find_cmdline_var(p, &l) >= 0 && l > 0) { if (do_special && find_cmdline_var(p, &l) >= 0) {
*d++ = '\\'; // insert backslash *d++ = '\\'; // insert backslash
do { // copy the var memcpy(d, p, l); // copy the var
*d++ = *p++; d += l;
} while (--l > 0); p += l;
continue; continue;
} }
if (*p == '\\' && fish_like) { if (*p == '\\' && fish_like) {

4
test/old/testdir/test_shell.vim
View File

@@ -119,6 +119,10 @@ func Test_shellescape()
call assert_equal("'te\\#xt'", shellescape("te#xt", 1)) 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"))
call assert_equal("'te\\!xt'", shellescape("te!xt", 1)) 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"))
call assert_equal("'te\\\nxt'", shellescape("te\nxt", 1)) call assert_equal("'te\\\nxt'", shellescape("te\nxt", 1))