aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.5146: memory leak when substitute expression nests

Browse Source 
Problem:    Memory leak when substitute expression nests.
Solution:   Use an array of expression results.
This commit is contained in:
Bram Moolenaar
2022-06-21 22:15:25 +01:00
parent cf801d4b95
commit 44ddf19ec0
7 changed files with 77 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ex_cmds.c
View File

@@ -3701,6 +3701,7 @@ ex_substitute(exarg_T *eap)
int start_nsubs;
#ifdef FEAT_EVAL
int save_ma = 0;
int save_sandbox = 0;
#endif
cmd = eap->arg;
@@ -4403,6 +4404,7 @@ ex_substitute(exarg_T *eap)
*/
#ifdef FEAT_EVAL
save_ma = curbuf->b_p_ma;
save_sandbox = sandbox;
if (subflags.do_count)
{
// prevent accidentally changing the buffer by a function
@@ -4416,7 +4418,8 @@ ex_substitute(exarg_T *eap)
// Disallow changing text or switching window in an expression.
++textlock;
#endif
// get length of substitution part
// Get length of substitution part, including the NUL.
// When it fails sublen is zero.
sublen = vim_regsub_multi(&regmatch,
sub_firstlnum - regmatch.startpos[0].lnum,
sub, sub_firstline, 0,
@@ -4429,11 +4432,10 @@ ex_substitute(exarg_T *eap)
// the replacement.
// Don't keep flags set by a recursive call.
subflags = subflags_save;
if (aborting() || subflags.do_count)
if (sublen == 0 || aborting() || subflags.do_count)
{
curbuf->b_p_ma = save_ma;
if (sandbox > 0)
sandbox--;
sandbox = save_sandbox;
goto skip;
}
#endif