# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472848207 -7200
# Node ID 32bd4001e398b7eb53f04ebd6578b3fe9fc03530
# Parent  b8cd5f4e475d18015cdb40647fa636c7a1b5e033
commit https://github.com/vim/vim/commit/a5d4121eed942bbbc672a7b00bf20866c17dc858
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Sep 2 22:18:49 2016 +0200

    patch 7.4.2310
    Problem:    Accessing freed memory when a timer does not repeat.
    Solution:   Free after removing it. (Dominique Pelle)

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1222,8 +1222,8 @@ check_due_timer(void)
 		}
 		else
 		{
+		    remove_timer(timer);
 		    free_timer(timer);
-		    remove_timer(timer);
 		}
 		/* the callback may do anything, start all over */
 		break;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2310,
+/**/
     2309,
 /**/
     2308,