mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.4977: memory access error when substitute expression changes window
Problem: Memory access error when substitute expression changes window. Solution: Disallow changing window in substitute expression.
This commit is contained in:
parent
b1040dc11f
commit
e2bd8600b8
@ -4412,12 +4412,17 @@ ex_substitute(exarg_T *eap)
|
||||
// Save flags for recursion. They can change for e.g.
|
||||
// :s/^/\=execute("s#^##gn")
|
||||
subflags_save = subflags;
|
||||
|
||||
// Disallow changing text or switching window in an expression.
|
||||
++textwinlock;
|
||||
#endif
|
||||
// get length of substitution part
|
||||
sublen = vim_regsub_multi(®match,
|
||||
sub_firstlnum - regmatch.startpos[0].lnum,
|
||||
sub, sub_firstline, FALSE, magic_isset(), TRUE);
|
||||
#ifdef FEAT_EVAL
|
||||
--textwinlock;
|
||||
|
||||
// If getting the substitute string caused an error, don't do
|
||||
// the replacement.
|
||||
// Don't keep flags set by a recursive call.
|
||||
@ -4518,9 +4523,15 @@ ex_substitute(exarg_T *eap)
|
||||
mch_memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
|
||||
new_end += copy_len;
|
||||
|
||||
#ifdef FEAT_EVAL
|
||||
++textwinlock;
|
||||
#endif
|
||||
(void)vim_regsub_multi(®match,
|
||||
sub_firstlnum - regmatch.startpos[0].lnum,
|
||||
sub, new_end, TRUE, magic_isset(), TRUE);
|
||||
#ifdef FEAT_EVAL
|
||||
--textwinlock;
|
||||
#endif
|
||||
sub_nsubs++;
|
||||
did_sub = TRUE;
|
||||
|
||||
|
@ -1000,6 +1000,19 @@ func Test_using_old_sub()
|
||||
set nocompatible
|
||||
endfunc
|
||||
|
||||
" This was switching windows in between computing the length and using it.
|
||||
func Test_sub_change_window()
|
||||
silent! lfile
|
||||
sil! norm o0000000000000000000000000000000000000000000000000000
|
||||
func Repl()
|
||||
lopen
|
||||
endfunc
|
||||
silent! s/\%')/\=Repl()
|
||||
bwipe!
|
||||
bwipe!
|
||||
delfunc Repl
|
||||
endfunc
|
||||
|
||||
" Test for the 2-letter and 3-letter :substitute commands
|
||||
func Test_substitute_short_cmd()
|
||||
new
|
||||
|
@ -746,6 +746,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
4977,
|
||||
/**/
|
||||
4976,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user