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

Problem:    Double free when compiled with EXITFREE and setting 'ttytype'.
Solution:   Avoid setting P_ALLOCED on 'ttytype'. (Dominique Pelle,
            closes vim/vim#1461)
673911457d
This commit is contained in:
Justin M. Keyes
2018-05-19 12:24:54 +02:00
parent a5de6770c5
commit 39f16a0fee
2 changed files with 30 additions and 13 deletions

View File

@@ -913,27 +913,24 @@ void set_number_default(char *name, long val)
}
#if defined(EXITFREE)
/*
* Free all options.
*/
/// Free all options.
void free_all_options(void)
{
int i;
for (i = 0; options[i].fullname; i++) {
for (int i = 0; options[i].fullname; i++) {
if (options[i].indir == PV_NONE) {
/* global option: free value and default value. */
if (options[i].flags & P_ALLOCED && options[i].var != NULL)
// global option: free value and default value.
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)
}
if (options[i].flags & P_DEF_ALLOCED) {
free_string_option(options[i].def_val[VI_DEFAULT]);
} else if (options[i].var != VAR_WIN
&& (options[i].flags & P_STRING))
/* buffer-local option: free global value */
}
} else if (options[i].var != VAR_WIN && (options[i].flags & P_STRING)) {
// buffer-local option: free global value
free_string_option(*(char_u **)options[i].var);
}
}
}
#endif