Updated date/time conversions from ticks to apply value mask so that any leap second bits are not included in converted timestamps.

Author: ritchiecarroll

src/lib/CommonTypes.h

@@ -29,6 +29,7 @@
 #include <cstddef>
 #include <map>
 #include <unordered_map>
+#include <string>
 
 // Reduce boost code analysis warnings
 #pragma warning(push)
@@ -196,6 +197,8 @@ namespace sttp
 
         // Flag (63rd bit) that indicates if leap second is positive or negative; 0 for add, 1 for delete.
         static constexpr int64_t LeapSecondDirection = 1LL << 62;
+
+        static constexpr int64_t ValueMask = ~LeapSecondFlag & ~LeapSecondDirection;
     };
 
     inline int32_t ConvertInt32(const size_t value)

src/lib/Convert.cpp

@@ -162,8 +162,10 @@ string PreparseTimestamp(const string& timestamp, TimeSpan& utcOffset)
     return updatedTimestamp;
 }
 
-void sttp::ToUnixTime(const int64_t ticks, time_t& unixSOC, uint16_t& milliseconds)
+void sttp::ToUnixTime(int64_t ticks, time_t& unixSOC, uint16_t& milliseconds)
 {
+    ticks = ticks & Ticks::ValueMask;
+
     // Unix dates are measured as the number of seconds since 1/1/1970
     unixSOC = (ticks - Ticks::UnixBaseOffset) / Ticks::PerSecond;
 
@@ -178,10 +180,13 @@ datetime_t sttp::FromUnixTime(const time_t unixSOC, const uint16_t milliseconds)
     return from_time_t(unixSOC) + Milliseconds(milliseconds);
 }
 
-datetime_t sttp::FromTicks(const int64_t ticks)
+datetime_t sttp::FromTicks(int64_t ticks)
 {
+    ticks = ticks & Ticks::ValueMask;
+
     const datetime_t time = from_time_t((ticks - Ticks::UnixBaseOffset) / Ticks::PerSecond);
     const int64_t pticks = ticks % Ticks::PerSecond * DateTimeTicksPerSecond / Ticks::PerSecond;
+
     return time + TimeSpan(0, 0, 0, pticks % DateTimeTicksPerSecond);
 }