thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0438: Wrong Ex command executed when :g uses '?' as delimiter

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: #14837

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-05-24 07:37:36 +02:00
committed by Christian Brabandt
parent 22ac941208
commit 3074137542
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/regexp.c
View File

@@ -620,7 +620,7 @@ skip_regexp_ex(
{
magic_T mymagic;
char_u *p = startp;
size_t startplen = STRLEN(startp);
size_t startplen = 0;
if (magic)
mymagic = MAGIC_ON;
@@ -644,16 +644,21 @@ skip_regexp_ex(
if (dirc == '?' && newp != NULL && p[1] == '?')
{
// change "\?" to "?", make a copy first.
if (startplen == 0)
startplen = STRLEN(startp);
if (*newp == NULL)
{
*newp = vim_strnsave(startp, startplen);
if (*newp != NULL)
{
p = *newp + (p - startp);
startp = *newp;
}
}
if (dropped != NULL)
++*dropped;
if (*newp != NULL)
mch_memmove(p, p + 1, (startplen - ((p + 1) - *newp)) + 1);
mch_memmove(p, p + 1, startplen - ((p + 1) - startp) + 1);
else
++p;
}