nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3243

Browse Source 
2bc8c3db epee get_ns_count: cast to uint64_t before multiplying 10^9 to avoid overflow (stoffu)
This commit is contained in:
Riccardo Spagni 2018-02-20 17:46:15 +02:00
commit e3ad0c9ca6
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/include/misc_os_dependent.h
View File

@ -75,13 +75,13 @@ namespace misc_utils
clock_get_time(cclock, &mts); clock_get_time(cclock, &mts);
mach_port_deallocate(mach_task_self(), cclock); 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 #else
struct timespec ts; struct timespec ts;
if(clock_gettime(CLOCK_MONOTONIC, &ts) != 0) { if(clock_gettime(CLOCK_MONOTONIC, &ts) != 0) {
return 0; return 0;
} }
return (ts.tv_sec * 1000000000) + (ts.tv_nsec); return ((uint64_t)ts.tv_sec * 1000000000) + (ts.tv_nsec);
#endif #endif
} }