Fix signed integer overflow in StaticTracepointTest.cpp

[folly.git] / folly / portability / SysTime.cpp

diff --git a/folly/portability/SysTime.cpp b/folly/portability/SysTime.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 9969a17..c3a965f
--- a/folly/portability/SysTime.cpp
+++ b/folly/portability/SysTime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,17 +17,22 @@
 #include <folly/portability/SysTime.h>
 
 #ifdef _WIN32
+
 #include <cstdint>
-#include <Windows.h>
 
 extern "C" {
-int gettimeofday(timeval* tv, timezone*) {
+int gettimeofday(timeval* tv, struct timezone*) {
   constexpr auto posixWinFtOffset = 116444736000000000ULL;
 
   if (tv) {
     FILETIME ft;
+    ULARGE_INTEGER lft;
     GetSystemTimeAsFileTime(&ft);
-    uint64_t ns = *(uint64_t*)&ft;
+    // As per the docs of FILETIME, don't just do an indirect
+    // pointer cast, to avoid alignment faults.
+    lft.HighPart = ft.dwHighDateTime;
+    lft.LowPart = ft.dwLowDateTime;
+    uint64_t ns = lft.QuadPart;
     tv->tv_usec = (long)((ns / 10ULL) % 1000000ULL);
     tv->tv_sec = (long)((ns - posixWinFtOffset) / 10000000ULL);
   }
@@ -53,4 +58,5 @@ void timersub(timeval* a, timeval* b, timeval* res) {
   }
 }
 }
+
 #endif