From: Stephan Bosch <stephan@dovecot.fi>
Date: Tue, 14 Jun 2016 23:53:44 +0000 (+0200)
Subject: time-util: Fixed usec comparison in timeval_cmp_margin().
X-Git-Tag: 2.2.25.rc1~139
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf757d601e94987bca6c26a353221abc88e37762;p=thirdparty%2Fdovecot%2Fcore.git

time-util: Fixed usec comparison in timeval_cmp_margin().
---

diff --git a/src/lib/time-util.c b/src/lib/time-util.c
index 9bfad68558..3ab1a86821 100644
--- a/src/lib/time-util.c
+++ b/src/lib/time-util.c
@@ -28,10 +28,10 @@ int timeval_cmp_margin(const struct timeval *tv1, const struct timeval *tv2,
 	if (tv1->tv_sec > tv2->tv_sec)
 		return 1;
 
-	if (tv1->tv_usec - tv2->tv_usec < (int)usec_margin)
-		return -1;
-	if (tv1->tv_usec - tv2->tv_usec > (int)usec_margin)
+	if ((tv2->tv_usec - tv1->tv_usec) > (int)usec_margin)
 		return -1;
+	if ((tv1->tv_usec - tv2->tv_usec) > (int)usec_margin)
+		return 1;
 	return 0;
 }