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
index a76b055220dfa1ed85c73a32d5d883ba8838989a..acaef9fcef4b524963d2d8baa5d004a82d8acd94 100644 (file)
--- 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 5fd33ecfa6c4eb173f5d6a2a6e67150ed814b801..784b405ae8b2a2b19817ba2dc507478156ddd862 100644 (file)
--- 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,
 /**/