patch 9.0.1145: invalid memory access with recursive substitute expression

Problem:    Invalid memory access with recursive substitute expression.
Solution:   Check the return value of vim_regsub().
This commit is contained in:
Bram Moolenaar
2023-01-04 17:17:54 +00:00
parent c32949b077
commit 3ac1d97a1d
3 changed files with 23 additions and 0 deletions

View File

@ -7312,6 +7312,11 @@ do_string_sub(
* - The text after the match.
*/
sublen = vim_regsub(&regmatch, sub, expr, tail, 0, REGSUB_MAGIC);
if (sublen <= 0)
{
ga_clear(&ga);
break;
}
if (ga_grow(&ga, (int)((end - tail) + sublen -
(regmatch.endp[0] - regmatch.startp[0]))) == FAIL)
{

View File

@ -1115,6 +1115,22 @@ func Test_sub_expr_goto_other_file()
bwipe!
endfunc
func Test_recursive_expr_substitute()
" this was reading invalid memory
let lines =<< trim END
func Repl(g, n)
s
r%:s000
endfunc
next 0
let caught = 0
s/\%')/\=Repl(0, 0)
qall!
END
call writefile(lines, 'XexprSubst', 'D')
call RunVim([], [], '--clean -S XexprSubst')
endfunc
" Test for the 2-letter and 3-letter :substitute commands
func Test_substitute_short_cmd()
new

View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1145,
/**/
1144,
/**/