From 622b64603748cceafd47f7537b96610e824e0680 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 10 Nov 2019 15:16:54 +0100 Subject: patch 8.1.2286: using border highlight in popup window leaks memory Problem: Using border highlight in popup window leaks memory. Solution: Free memory before overwriting. (Dominique Pelle, closes #5203) --- src/popupwin.c | 6 ++++++ src/version.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/popupwin.c b/src/popupwin.c index ac8fff3d6..41839b44a 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -755,12 +755,18 @@ apply_general_options(win_T *wp, dict_T *dict) { str = tv_get_string(&li->li_tv); if (*str != NUL) + { + vim_free(wp->w_border_highlight[i]); wp->w_border_highlight[i] = vim_strsave(str); + } } if (list->lv_len == 1 && wp->w_border_highlight[0] != NULL) for (i = 1; i < 4; ++i) + { + vim_free(wp->w_border_highlight[i]); wp->w_border_highlight[i] = vim_strsave(wp->w_border_highlight[0]); + } } } diff --git a/src/version.c b/src/version.c index 823d4d8d6..ab75ea75f 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2286, /**/ 2285, /**/ -- cgit v1.2.1