From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Mon, 5 Jun 2017 09:55:56 +0000 (+0300)
Subject: lib: guid_128_generate() shouldn't generate invalid timestamps
X-Git-Tag: 2.3.0.rc1~1502
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b2aaea36ac44fc0a07996333ae8565a4e80ea18;p=thirdparty%2Fdovecot%2Fcore.git

lib: guid_128_generate() shouldn't generate invalid timestamps

The nsec validity check must take into account the soon-to-be-done increment.
---

diff --git a/src/lib/guid.c b/src/lib/guid.c
index 0feb745a5a..3c0cd51073 100644
--- a/src/lib/guid.c
+++ b/src/lib/guid.c
@@ -75,7 +75,7 @@ void guid_128_generate(guid_128_t guid_r)
 		   when a GUID was created. */
 		ts.tv_sec = ioloop_timeval.tv_sec;
 		ts.tv_nsec = ioloop_timeval.tv_usec*1000;
-	} else if ((uint32_t)ts.tv_nsec < 1000000000) {
+	} else if (ts.tv_nsec < 999999999L) {
 		ts.tv_nsec++;
 	} else {
 		ts.tv_sec++;