Permalink
Browse files

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

Problem:    Using freed memory with ":hi Normal".
Solution:   Get "item" again after updating the table.
  • Loading branch information...
brammool committed Sep 9, 2017
1 parent fe38664 commit b4ea1914b8ca7c368253bd96e6b3cb9e3392da1c
Showing with 17 additions and 2 deletions.
  1. +15 −2 src/syntax.c
  2. +2 −0 src/version.c
View
@@ -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;
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1078,
/**/
1077,
/**/

0 comments on commit b4ea191

Please sign in to comment.