38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
|
From 1a93153783c0ae626acf0b9041eeb2cb2fe7944a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
||
|
|
Date: Tue, 8 Jan 2019 17:34:45 +0100
|
||
|
|
Subject: [PATCH 423/557] timediff: fix math for unsigned time_t
|
||
|
|
|
||
|
|
Bug: https://curl.haxx.se/mail/lib-2018-12/0088.html
|
||
|
|
|
||
|
|
Closes #3449
|
||
|
|
---
|
||
|
|
lib/timeval.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/timeval.c b/lib/timeval.c
|
||
|
|
index 2d7c782..f1cbfe6 100644
|
||
|
|
--- a/lib/timeval.c
|
||
|
|
+++ b/lib/timeval.c
|
||
|
|
@@ -163,7 +163,7 @@ struct curltime Curl_now(void)
|
||
|
|
*/
|
||
|
|
timediff_t Curl_timediff(struct curltime newer, struct curltime older)
|
||
|
|
{
|
||
|
|
- timediff_t diff = newer.tv_sec-older.tv_sec;
|
||
|
|
+ timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
|
||
|
|
if(diff >= (TIME_MAX/1000))
|
||
|
|
return TIME_MAX;
|
||
|
|
else if(diff <= (TIME_MIN/1000))
|
||
|
|
@@ -177,7 +177,7 @@ timediff_t Curl_timediff(struct curltime newer, struct curltime older)
|
||
|
|
*/
|
||
|
|
timediff_t Curl_timediff_us(struct curltime newer, struct curltime older)
|
||
|
|
{
|
||
|
|
- timediff_t diff = newer.tv_sec-older.tv_sec;
|
||
|
|
+ timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
|
||
|
|
if(diff >= (TIME_MAX/1000000))
|
||
|
|
return TIME_MAX;
|
||
|
|
else if(diff <= (TIME_MIN/1000000))
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|