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

patch 8.0.1078: using freed memory with ":hi Normal"

Browse Source 
Problem:    Using freed memory with ":hi Normal".
Solution:   Get "item" again after updating the table.
This commit is contained in:
Bram Moolenaar 2017-09-09 15:28:14 +02:00
parent fe386641b0
commit b4ea1914b8
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/syntax.c
View File

@ -7380,6 +7380,9 @@ do_highlight(
#else
# define is_menu_group 0
# define is_tooltip_group 0
#endif
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
int did_highlight_changed = FALSE;
#endif
/*
@ -7568,8 +7571,9 @@ do_highlight(
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
if (USE_24BIT)
highlight_gui_started();
else
#endif
highlight_changed();
highlight_changed();
redraw_later_clear();
return;
}
@ -8174,7 +8178,12 @@ do_highlight(
#endif
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
if (USE_24BIT)
{
highlight_gui_started();
item = &HL_TABLE()[idx]; /* table may have changed */
did_highlight_changed = TRUE;
redraw_all_later(NOT_VALID);
}
#endif
}
#ifdef FEAT_GUI_X11
@ -8210,7 +8219,11 @@ do_highlight(
/* Only call highlight_changed() once, after a sequence of highlight
* commands, and only if an attribute actually changed. */
if (memcmp(item, &item_before, sizeof(item_before)) != 0)
if (memcmp(item, &item_before, sizeof(item_before)) != 0
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
&& !did_highlight_changed
#endif
)
{
redraw_all_later(NOT_VALID);
need_highlight_changed = TRUE;

2
src/version.c
View File

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