patch 8.0.0356: leaking memory when setting 'ttytype'

Problem:    Leaking memory when setting 'ttytype'.
Solution:   Get free_oldval from the right option entry.

diff --git a/src/option.c b/src/option.c
index 48a8048cb991da8157a1dd263abed595a201216b..4ba436341d52b27708120773751c9debe3df106f 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -5936,6 +5936,7 @@ did_set_string_option(
            /* Both 'term' and 'ttytype' point to T_NAME, only set the
             * P_ALLOCED flag on 'term'. */
            opt_idx = findoption((char_u *)"term");
+           free_oldval = (options[opt_idx].flags & P_ALLOCED);
        }
     }
 

diff --git a/src/version.c b/src/version.c
index 64e11118b5ea1e63b1a048f96928e8fdaf2f95fd..94a325beb5acb7bf8aed4d5d29105a74729d55ac 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    356,
 /**/
     355,
 /**/