thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1759: memory leak from duplicate options

Browse Source 
Problem:    Memory leak from duplicate options. (Yegappan Lakshmanan)
Solution:   Don't set the default value twice.
This commit is contained in:
Bram Moolenaar
2018-04-24 20:23:56 +02:00
parent 24a2d7264f
commit 09d1d51df5
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/option.c
View File

@@ -3804,6 +3804,11 @@ set_option_default(
{
dvi = ((flags & P_VI_DEF) || compatible) ? VI_DEFAULT : VIM_DEFAULT;
if (flags & P_STRING)
{
/* 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)
{
/* Use set_string_option_direct() for local options to handle
* freeing and allocating the value. */
@@ -3818,6 +3823,7 @@ set_option_default(
options[opt_idx].flags &= ~P_ALLOCED;
}
}
}
else if (flags & P_NUM)
{
if (options[opt_idx].indir == PV_SCROLL)

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1759,
/**/
1758,
/**/