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)

diff --git a/src/popupwin.c b/src/popupwin.c
index ac8fff3d63db394ae557676bbc012f7913554291..41839b44a0d31983158e048161ea1b5fecc189b3 100644 (file)
--- 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 823d4d8d692b129521e9f5ec1b0f168d5ac58de6..ab75ea75ff8e3ef31e9f889387c9a33648defe1d 100644 (file)
--- 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,
 /**/