From 45a1508a229b1d1d2eb79cabe55a183dc18fd040 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 25 May 2020 00:28:33 +0200 Subject: [PATCH] patch 8.2.0821: Vim9: memory leak in expr test Problem: Vim9: memory leak in expr test. Solution: Do not decrement the length of the list of functions if the current function is not at the end. --- src/version.c | 2 ++ src/vim9compile.c | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/version.c b/src/version.c index a1e4a7f48..2d99068b0 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 821, /**/ 820, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 7d302da83..5adea9f7e 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1443,7 +1443,7 @@ generate_CALL(cctx_T *cctx, ufunc_T *ufunc, int pushed_argcount) } } if (ufunc->uf_dfunc_idx == UF_TO_BE_COMPILED) - if (compile_def_function(ufunc, TRUE, cctx) == FAIL) + if (compile_def_function(ufunc, TRUE, NULL) == FAIL) return FAIL; } @@ -6776,9 +6776,11 @@ erret: delete_instr(((isn_T *)instr->ga_data) + idx); ga_clear(instr); - ufunc->uf_dfunc_idx = UF_NOT_COMPILED; - if (!dfunc->df_deleted) + // if using the last entry in the table we might as well remove it + if (!dfunc->df_deleted + && ufunc->uf_dfunc_idx == def_functions.ga_len - 1) --def_functions.ga_len; + ufunc->uf_dfunc_idx = UF_NOT_COMPILED; while (cctx.ctx_scope != NULL) drop_scope(&cctx); -- 2.40.0