From c5f1ef53c24cc0c9f7b2131609e916f913634feb Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 12 Apr 2020 17:11:27 +0200 Subject: [PATCH] patch 8.2.0556: Vim9: memory leak when finding common type Problem: Vim9: memory leak when finding common type. Solution: Store allocated memory in type growarray. --- src/version.c | 2 ++ src/vim9compile.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/version.c b/src/version.c index 375ae6dbb7..7095794e1b 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 556, /**/ 555, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 8d536eb089..cf91d3bb37 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1823,8 +1823,8 @@ common_type(type_T *type1, type_T *type2, type_T **dest, garray_T *type_gap) *dest = alloc_func_type(common, argcount, type_gap); if (type1->tt_args != NULL && type2->tt_args != NULL) { - (*dest)->tt_args = ALLOC_CLEAR_MULT(type_T *, argcount); - if ((*dest)->tt_args != NULL) + if (func_type_add_arg_types(*dest, argcount, + type_gap) == OK) for (i = 0; i < argcount; ++i) common_type(type1->tt_args[i], type2->tt_args[i], &(*dest)->tt_args[i], type_gap);