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

vim-patch:9.1.0438: Wrong Ex command executed when :g uses '?' as delimiter (#28956)

Browse Source 
Problem:  Wrong Ex command executed when :g uses '?' as delimiter and
          pattern contains escaped '?'.
Solution: Don't use "*newp" when it's not allocated (zeertzjq).

closes: vim/vim#14837

3074137542
This commit is contained in:
zeertzjq
2024-05-24 15:04:33 +08:00
committed by GitHub
parent 521b9930b8
commit c836383d21
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/regexp.c
View File

@@ -774,7 +774,7 @@ char *skip_regexp_ex(char *startp, int dirc, int magic, char **newp, int *droppe
{ {
magic_T mymagic; magic_T mymagic;
char *p = startp; char *p = startp;
size_t startplen = strlen(startp); size_t startplen = 0;
if (magic) { if (magic) {
mymagic = MAGIC_ON; mymagic = MAGIC_ON;
@@ -796,14 +796,18 @@ char *skip_regexp_ex(char *startp, int dirc, int magic, char **newp, int *droppe
} else if (p[0] == '\\' && p[1] != NUL) { } else if (p[0] == '\\' && p[1] != NUL) {
if (dirc == '?' && newp != NULL && p[1] == '?') { if (dirc == '?' && newp != NULL && p[1] == '?') {
// change "\?" to "?", make a copy first. // change "\?" to "?", make a copy first.
if (startplen == 0) {
startplen = strlen(startp);
}
if (*newp == NULL) { if (*newp == NULL) {
*newp = xstrnsave(startp, startplen); *newp = xstrnsave(startp, startplen);
p = *newp + (p - startp); p = *newp + (p - startp);
startp = *newp;
} }
if (dropped != NULL) { if (dropped != NULL) {
(*dropped)++; (*dropped)++;
} }
memmove(p, p + 1, (startplen - (size_t)((p + 1) - *newp)) + 1); memmove(p, p + 1, startplen - (size_t)((p + 1) - startp) + 1);
} else { } else {
p++; // skip next character p++; // skip next character
} }

11
test/old/testdir/test_global.vim
View File

@@ -96,7 +96,16 @@ func Test_global_newline()
close! close!
endfunc endfunc
func Test_wrong_delimiter() " Test :g with ? as delimiter.
func Test_global_question_delimiter()
new
call setline(1, ['aaaaa', 'b?bbb', 'ccccc', 'ddd?d', 'eeeee'])
g?\??delete
call assert_equal(['aaaaa', 'ccccc', 'eeeee'], getline(1, '$'))
bwipe!
endfunc
func Test_global_wrong_delimiter()
call assert_fails('g x^bxd', 'E146:') call assert_fails('g x^bxd', 'E146:')
endfunc endfunc

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

@@ -174,8 +174,8 @@ func Test_substitute_repeat()
bwipe! bwipe!
endfunc endfunc
" Test :s with ? as separator. " Test :s with ? as delimiter.
func Test_substitute_question_separator() func Test_substitute_question_delimiter()
new new
call setline(1, '??:??') call setline(1, '??:??')
%s?\?\??!!?g %s?\?\??!!?g