From: Ken Takata <kentkt@csc.jp>
Date: Mon, 29 Jul 2024 18:39:12 +0000 (+0200)
Subject: patch 9.1.0639: channel timeout may wrap around
X-Git-Tag: v9.1.0639^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0bee82b1d0a46a6ca6fb4ffcebd6a63d4141a355;p=thirdparty%2Fvim.git

patch 9.1.0639: channel timeout may wrap around

Problem:  channel timeout may wrap around
Solution: Correct timeout calculation when GetTickCount() wraps around
          (Ken Takata)

closes: #15390

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/channel.c b/src/channel.c
index b99b3a90ae..69bbff24e9 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2277,7 +2277,7 @@ channel_parse_json(channel_T *channel, ch_part_T part)
 	{
 	    int timeout;
 #ifdef MSWIN
-	    timeout = GetTickCount() > chanpart->ch_deadline;
+	    timeout = (int)(GetTickCount() - chanpart->ch_deadline) > 0;
 #else
 	    {
 		struct timeval now_tv;
diff --git a/src/version.c b/src/version.c
index f8d1762b84..97414a08a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    639,
 /**/
     638,
 /**/