summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-10 23:11:53 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-10 23:11:53 +0200
commit04816717dfea6e2469ff4c9d40f68b59aaf03724 (patch)
tree4555ac9bf8b4046e7e8c21b59928f5bae1f421f8
parentcb2bdb1c6d8b6df4a3d9cfb1ad9e602dace5d310 (diff)
patch 8.2.0734: Vim9: leaking memory when using :finishv8.2.0734
Problem: Vim9: leaking memory when using :finish. Solution: Do not check for next line in third pass.
-rw-r--r--src/scriptfile.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/scriptfile.c b/src/scriptfile.c
index 86e8b01105..7a148a7c8a 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -1773,7 +1773,11 @@ getsourceline(int c UNUSED, void *cookie, int indent UNUSED, int do_concat)
// Only concatenate lines starting with a \ when 'cpoptions' doesn't
// contain the 'C' flag.
- if (line != NULL && do_concat && vim_strchr(p_cpo, CPO_CONCAT) == NULL)
+ if (line != NULL && do_concat && vim_strchr(p_cpo, CPO_CONCAT) == NULL
+#ifdef FEAT_EVAL
+ && sp->use_lines_ga < 0
+#endif
+ )
{
// compensate for the one line read-ahead
--sp->sourcing_lnum;
diff --git a/src/version.c b/src/version.c
index 9dc3c22e53..19920dea87 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 734,
+/**/
733,
/**/
732,