unix: fix integer overflow in uv_hrtime

Conversion to nanoseconds was overflowing with 32-bit builds.
joyent · Aug 18, 2012 · ce87b7e · ce87b7e
1 parent 22ce5a3
commit ce87b7e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/unix/cygwin.c b/src/unix/cygwin.c
@@ -35,7 +35,7 @@
 uint64_t uv_hrtime() {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  return (ts.tv_sec * NANOSEC + ts.tv_nsec);
+  return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
 }
 
 void uv_loadavg(double avg[3]) {

diff --git a/src/unix/freebsd.c b/src/unix/freebsd.c
@@ -57,7 +57,7 @@ static char *process_title;
 uint64_t uv_hrtime(void) {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  return (ts.tv_sec * NANOSEC + ts.tv_nsec);
+  return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
 }
 
 

diff --git a/src/unix/linux/linux-core.c b/src/unix/linux/linux-core.c
@@ -71,7 +71,7 @@ static struct {
 uint64_t uv_hrtime() {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  return (ts.tv_sec * NANOSEC + ts.tv_nsec);
+  return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
 }
 
 

diff --git a/src/unix/netbsd.c b/src/unix/netbsd.c
@@ -38,7 +38,7 @@
 uint64_t uv_hrtime(void) {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  return (ts.tv_sec * NANOSEC + ts.tv_nsec);
+  return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
 }
 
 void uv_loadavg(double avg[3]) {

diff --git a/src/unix/openbsd.c b/src/unix/openbsd.c
@@ -46,7 +46,7 @@ static char *process_title;
 uint64_t uv_hrtime(void) {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  return (ts.tv_sec * NANOSEC + ts.tv_nsec);
+  return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec);
 }