1
0
forked from aniani/vim

updated for version 7.4.660

Problem:    Using freed memory when g:colors_name is changed in the colors
            script. (oni-link)
Solution:   Make a copy of the variable value.
This commit is contained in:
Bram Moolenaar
2015-03-13 12:53:37 +01:00
parent 488eb26ec7
commit c7dc1f4a53
2 changed files with 18 additions and 2 deletions

View File

@@ -6988,8 +6988,22 @@ init_highlight(both, reset)
* and 'background' or 't_Co' is changed.
*/
p = get_var_value((char_u *)"g:colors_name");
if (p != NULL && load_colors(p) == OK)
return;
if (p != NULL)
{
/* The value of g:colors_name could be freed when sourcing the script,
* making "p" invalid, so copy it. */
char_u *copy_p = vim_strsave(p);
int r;
if (copy_p != NULL)
{
r = load_colors(copy_p);
vim_free(copy_p);
if (r == OK)
return;
}
}
#endif
/*