patch 8.0.1759: memory leak from duplicate options

Problem:    Memory leak from duplicate options. (Yegappan Lakshmanan)
Solution:   Don't set the default value twice.

diff --git a/src/option.c b/src/option.c
index aea5066470da934bf465b115a448f2378198e5e8..31aec7e78113166513b2cf82c773c2cbf30ce111 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -3805,17 +3805,23 @@ set_option_default(
        dvi = ((flags & P_VI_DEF) || compatible) ? VI_DEFAULT : VIM_DEFAULT;
        if (flags & P_STRING)
        {
-           /* Use set_string_option_direct() for local options to handle
-            * freeing and allocating the value. */
-           if (options[opt_idx].indir != PV_NONE)
-               set_string_option_direct(NULL, opt_idx,
-                                options[opt_idx].def_val[dvi], opt_flags, 0);
-           else
+           /* skip 'termkey' and 'termsize, they are duplicates of
+            * 'termwinkey' and 'termwinsize' */
+           if (STRCMP(options[opt_idx].fullname, "termkey") != 0
+                   && STRCMP(options[opt_idx].fullname, "termsize") != 0)
            {
-               if ((opt_flags & OPT_FREE) && (flags & P_ALLOCED))
-                   free_string_option(*(char_u **)(varp));
-               *(char_u **)varp = options[opt_idx].def_val[dvi];
-               options[opt_idx].flags &= ~P_ALLOCED;
+               /* Use set_string_option_direct() for local options to handle
+                * freeing and allocating the value. */
+               if (options[opt_idx].indir != PV_NONE)
+                   set_string_option_direct(NULL, opt_idx,
+                                    options[opt_idx].def_val[dvi], opt_flags, 0);
+               else
+               {
+                   if ((opt_flags & OPT_FREE) && (flags & P_ALLOCED))
+                       free_string_option(*(char_u **)(varp));
+                   *(char_u **)varp = options[opt_idx].def_val[dvi];
+                   options[opt_idx].flags &= ~P_ALLOCED;
+               }
            }
        }
        else if (flags & P_NUM)

diff --git a/src/version.c b/src/version.c
index dfd82f997256c17cdf1b8722986e104fa2938b45..c25fcf1634e44cb7f8b8496b3652465e8ecc5b92 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1759,
 /**/
     1758,
 /**/