patch 7.4.2361

Problem:    Checking for last_timer_id to overflow is not reliable. (Ozaki
            Kiichi)
Solution:   Check for the number not going up.

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 8df67536c55c0b74bd386ef0a3072d1c402a9c50..b8d8dca9e0d5550cf7b19723a6cd015fd67756e1 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1143,10 +1143,11 @@ free_timer(timer_T *timer)
 create_timer(long msec, int repeat)
 {
     timer_T    *timer = (timer_T *)alloc_clear(sizeof(timer_T));
+    long       prev_id = last_timer_id;
 
     if (timer == NULL)
        return NULL;
-    if (++last_timer_id < 0)
+    if (++last_timer_id <= prev_id)
        /* Overflow!  Might cause duplicates... */
        last_timer_id = 0;
     timer->tr_id = last_timer_id;

diff --git a/src/version.c b/src/version.c
index a71647b908ac9c16ca60ad76dfaa546d6d9949b0..9a6851e556312750ef8757aefe4c5c6f9797f1a1 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 */
+/**/
+    2361,
 /**/
     2360,
 /**/