Avoid integer overflow in MonotonicClock{S,MS,US}

This is Darwin specific: the previous implementation was causing an integer overflow when base.numer is very large. On PPC Darwin, the timebase info is 1000000000/33330116 and this is too large for integer arithmetic.

Avoid integer overflow in MonotonicClock{S,MS,US}
a4f4fc50 · PHO · Max Kellermann · ad1b6ef0 · a4f4fc50 · a4f4fc50
Commit a4f4fc50 authored Jan 26, 2015 by PHO Committed by Max Kellermann Jan 29, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

NEWS NEWS +1 -0

Clock.cxx src/system/Clock.cxx +4 -4

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.23 (not yet released)
 * despotify: remove defunct plugin
+* fix clock integer overflow on OS X
 * fix gcc 5.0 warnings

 ver 0.18.22 (2014/01/14)

--- a/src/system/Clock.cxx
+++ b/src/system/Clock.cxx
@@ -40,8 +40,8 @@ MonotonicClockMS(void)
 	if (base.denom == 0)
 		(void)mach_timebase_info(&base);

-	return (unsigned)((mach_absolute_time() * base.numer)
-			  / (1000000 * base.denom));
+	return (unsigned)(((double)mach_absolute_time() * base.numer)
+			  / base.denom / 1000000);
 #elif defined(CLOCK_MONOTONIC)
 	struct timespec ts;
 	clock_gettime(CLOCK_MONOTONIC, &ts);
@@ -82,8 +82,8 @@ MonotonicClockUS(void)
 	if (base.denom == 0)
 		(void)mach_timebase_info(&base);

-	return ((uint64_t)mach_absolute_time() * (uint64_t)base.numer)
-		/ (1000 * (uint64_t)base.denom);
+	return (uint64_t)(((double)mach_absolute_time() * base.numer)
+		/ base.denom / 1000);
 #elif defined(CLOCK_MONOTONIC)
 	struct timespec ts;
 	clock_gettime(CLOCK_MONOTONIC, &ts);