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 aea5066..31aec7e 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3805,17 +3805,23 @@
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)