Mercurial > vim
changeset 35253:cfe900e9ffdd v9.1.0436
patch 9.1.0436: Crash when using '?' as separator for :s
Commit: https://github.com/vim/vim/commit/789679cfc4f39505b135220672b43a260d8ca3b4
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu May 23 17:41:26 2024 +0200
patch 9.1.0436: Crash when using '?' as separator for :s
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
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 23 May 2024 17:45:07 +0200 |
| parents | 5edf5ebb213f |
| children | 788039f8f692 |
| files | src/regexp.c src/testdir/test_substitute.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp.c +++ b/src/regexp.c @@ -620,6 +620,7 @@ skip_regexp_ex( { magic_T mymagic; char_u *p = startp; + size_t startplen = STRLEN(startp); if (magic) mymagic = MAGIC_ON; @@ -642,12 +643,9 @@ skip_regexp_ex( { if (dirc == '?' && newp != NULL && p[1] == '?') { - size_t startplen = 0; - // change "\?" to "?", make a copy first. if (*newp == NULL) { - startplen = STRLEN(startp); *newp = vim_strnsave(startp, startplen); if (*newp != NULL) p = *newp + (p - startp);
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -173,6 +173,16 @@ func Test_substitute_repeat() call feedkeys("Qsc\<CR>y", 'tx') bwipe! 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 " more efficient join rather than doing a regular substitution. func Test_substitute_join()