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

vim-patch:9.1.0436: Crash when using '?' as separator for :s (#28955)

Browse Source 
Problem:  Crash when using '?' as separator for :s and pattern contains
          escaped '?'s (after 9.1.0409).
Solution: Always compute startplen. (zeertzjq).

related: neovim/neovim#28935
closes: 14832

789679cfc4
This commit is contained in:
zeertzjq
2024-05-24 05:57:00 +08:00
committed by GitHub
parent 0d3d198109
commit e7859d2ad5
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/regexp.c
View File

@@ -774,6 +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);
if (magic) { if (magic) {
mymagic = MAGIC_ON; mymagic = MAGIC_ON;
@@ -793,11 +794,9 @@ char *skip_regexp_ex(char *startp, int dirc, int magic, char **newp, int *droppe
break; break;
} }
} else if (p[0] == '\\' && p[1] != NUL) { } else if (p[0] == '\\' && p[1] != NUL) {
size_t startplen = 0;
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 (*newp == NULL) { if (*newp == NULL) {
startplen = strlen(startp);
*newp = xstrnsave(startp, startplen); *newp = xstrnsave(startp, startplen);
p = *newp + (p - startp); p = *newp + (p - startp);
} }

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

@@ -173,6 +173,16 @@ func Test_substitute_repeat()
call feedkeys("Qsc\<CR>y", 'tx') call feedkeys("Qsc\<CR>y", 'tx')
bwipe! bwipe!
endfunc endfunc
" Test :s with ? as separator.
func Test_substitute_question_separator()
new
call setline(1, '??:??')
%s?\?\??!!?g
call assert_equal('!!:!!', getline(1))
bwipe!
endfunc
" Test %s/\n// which is implemented as a special case to use a " Test %s/\n// which is implemented as a special case to use a
" more efficient join rather than doing a regular substitution. " more efficient join rather than doing a regular substitution.
func Test_substitute_join() func Test_substitute_join()