forked from aniani/vim
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:
@@ -7312,6 +7312,11 @@ do_string_sub(
|
|||||||
* - The text after the match.
|
* - The text after the match.
|
||||||
*/
|
*/
|
||||||
sublen = vim_regsub(®match, sub, expr, tail, 0, REGSUB_MAGIC);
|
sublen = vim_regsub(®match, sub, expr, tail, 0, REGSUB_MAGIC);
|
||||||
|
if (sublen <= 0)
|
||||||
|
{
|
||||||
|
ga_clear(&ga);
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (ga_grow(&ga, (int)((end - tail) + sublen -
|
if (ga_grow(&ga, (int)((end - tail) + sublen -
|
||||||
(regmatch.endp[0] - regmatch.startp[0]))) == FAIL)
|
(regmatch.endp[0] - regmatch.startp[0]))) == FAIL)
|
||||||
{
|
{
|
||||||
|
@@ -1115,6 +1115,22 @@ func Test_sub_expr_goto_other_file()
|
|||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
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
|
" Test for the 2-letter and 3-letter :substitute commands
|
||||||
func Test_substitute_short_cmd()
|
func Test_substitute_short_cmd()
|
||||||
new
|
new
|
||||||
|
@@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1145,
|
||||||
/**/
|
/**/
|
||||||
1144,
|
1144,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user