From a5d4121eed942bbbc672a7b00bf20866c17dc858 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 2 Sep 2016 22:18:49 +0200 Subject: [PATCH] patch 7.4.2310 Problem: Accessing freed memory when a timer does not repeat. Solution: Free after removing it. (Dominique Pelle) --- src/ex_cmds2.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index a76b05522..acaef9fce 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1222,8 +1222,8 @@ check_due_timer(void) } else { - free_timer(timer); remove_timer(timer); + free_timer(timer); } /* the callback may do anything, start all over */ break; diff --git a/src/version.c b/src/version.c index 5fd33ecfa..784b405ae 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2310, /**/ 2309, /**/ -- 2.50.1