From 03d6e6f42b0deeb02d52c8a48c14abe431370c1c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 29 Oct 2022 21:53:08 +0100 Subject: patch 9.0.0820: memory leak with empty shell command Problem: Memory leak with empty shell command. Solution: Free the empty string. --- src/ex_cmds.c | 7 ++++++- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 44333d514c..7bb7aa0380 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -957,12 +957,15 @@ do_bang( } } while (trailarg != NULL); - // Don't clear "prevcmd" if there is no command to run. + // Only set "prevcmd" if there is a command to run, otherwise keep te one + // we have. if (STRLEN(newcmd) > 0) { vim_free(prevcmd); prevcmd = newcmd; } + else + free_newcmd = TRUE; if (bangredo) // put cmd in redo buffer for ! command { @@ -986,6 +989,8 @@ do_bang( */ if (*p_shq != NUL) { + if (free_newcmd) + vim_free(newcmd); newcmd = alloc(STRLEN(prevcmd) + 2 * STRLEN(p_shq) + 1); if (newcmd == NULL) return; diff --git a/src/version.c b/src/version.c index f9a00d632e..2d2ae6aaee 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 820, /**/ 819, /**/ -- cgit v1.2.3