aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstoffu <stoffu@protonmail.ch>2018-02-08 16:04:50 +0900
committerstoffu <stoffu@protonmail.ch>2018-02-08 16:04:50 +0900
commit2bc8c3db5c130ff37fa5711f4e8ca6fb3a533407 (patch)
tree8c6ee9bd949ffbc6d7edb031c55a62db46e0b572
parentMerge pull request #3198 (diff)
downloadmonero-2bc8c3db5c130ff37fa5711f4e8ca6fb3a533407.tar.xz
epee get_ns_count: cast to uint64_t before multiplying 10^9 to avoid overflow
-rw-r--r--contrib/epee/include/misc_os_dependent.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/epee/include/misc_os_dependent.h b/contrib/epee/include/misc_os_dependent.h
index 99690b301..ffe575501 100644
--- a/contrib/epee/include/misc_os_dependent.h
+++ b/contrib/epee/include/misc_os_dependent.h
@@ -75,13 +75,13 @@ namespace misc_utils
clock_get_time(cclock, &mts);
mach_port_deallocate(mach_task_self(), cclock);
- return (mts.tv_sec * 1000000000) + (mts.tv_nsec);
+ return ((uint64_t)mts.tv_sec * 1000000000) + (mts.tv_nsec);
#else
struct timespec ts;
if(clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
return 0;
}
- return (ts.tv_sec * 1000000000) + (ts.tv_nsec);
+ return ((uint64_t)ts.tv_sec * 1000000000) + (ts.tv_nsec);
#endif
}