From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 6 Dec 2020 15:03:55 +0000 (+0100)
Subject: patch 8.2.2101: Vim9: memory leak when literal dict has an error
X-Git-Tag: v8.2.2101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bb0f5472c740458708fd3edabbb8d5193a96241;p=vim

patch 8.2.2101: Vim9: memory leak when literal dict has an error

Problem:    Vim9: memory leak when literal dict has an error and when an
            expression is not complete.
Solution:   Clear the typval and the growarray.
---

diff --git a/src/dict.c b/src/dict.c
index 311b0038d..5581a5571 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -929,6 +929,7 @@ eval_dict(char_u **arg, typval_T *rettv, evalarg_T *evalarg, int literal)
 		if (**arg != ']')
 		{
 		    emsg(_(e_missing_matching_bracket_after_dict_key));
+		    clear_tv(&tvkey);
 		    return FAIL;
 		}
 		++*arg;
diff --git a/src/version.c b/src/version.c
index 2754d2f72..56cea2657 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2101,
 /**/
     2100,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index f02ea60cc..bfa54fea7 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4392,7 +4392,10 @@ compile_and_or(
 	    // eval the next expression
 	    *arg = skipwhite(p + 2);
 	    if (may_get_next_line_error(p + 2, arg, cctx) == FAIL)
+	    {
+		ga_clear(&end_ga);
 		return FAIL;
+	    }
 
 	    if ((opchar == '|' ? compile_expr3(arg, cctx, ppconst)
 				  : compile_expr4(arg, cctx, ppconst)) == FAIL)