0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 7.4.2310

Problem:    Accessing freed memory when a timer does not repeat.
Solution:   Free after removing it. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar
2016-09-02 22:18:49 +02:00
parent 11fbc2866c
commit a5d4121eed
2 changed files with 3 additions and 1 deletions

View File

@@ -1222,8 +1222,8 @@ check_due_timer(void)
} }
else else
{ {
free_timer(timer);
remove_timer(timer); remove_timer(timer);
free_timer(timer);
} }
/* the callback may do anything, start all over */ /* the callback may do anything, start all over */
break; break;

View File

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