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

patch 8.0.0342: double free with EXITFREE and setting 'ttytype'

Browse Source 
Problem:    Double free when compiled with EXITFREE and setting 'ttytype'.
Solution:   Avoid setting P_ALLOCED on 'ttytype'. (Dominique Pelle,
            closes #1461)
This commit is contained in:
Bram Moolenaar
2017-02-19 21:07:04 +01:00
parent d56a79d339
commit 673911457d
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/option.c
View File

@@ -3775,7 +3775,7 @@ free_all_options(void)
if (options[i].indir == PV_NONE)
{
/* global option: free value and default value. */
if (options[i].flags & P_ALLOCED && options[i].var != NULL)
if ((options[i].flags & P_ALLOCED) && options[i].var != NULL)
free_string_option(*(char_u **)options[i].var);
if (options[i].flags & P_DEF_ALLOCED)
free_string_option(options[i].def_val[VI_DEFAULT]);
@@ -5929,8 +5929,14 @@ did_set_string_option(
else if (set_termname(T_NAME) == FAIL)
errmsg = (char_u *)N_("E522: Not found in termcap");
else
{
/* Screen colors may have changed. */
redraw_later_clear();
/* Both 'term' and 'ttytype' point to T_NAME, only set the
* P_ALLOCED flag on 'term'. */
opt_idx = findoption((char_u *)"term");
}
}
/* 'backupcopy' */