Merge pull request #42 from ddash-ct/datetime-errors

Catch OSError for DateTime constructs and raise as ConstructError

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+
+## [Unreleased]
+
+### Changed
+- Catch OSError from DateTime related constructs and raise as ConstructError
+
+
 ## [3.13.0] - 2023-07-17
 
 ### Added

mwcp/utils/construct/datetime_.py

@@ -53,7 +53,10 @@ def __init__(self, subcon, tz=None):
         self._tz = tz
 
     def _decode(self, obj, context, path):
-        return datetime.datetime.fromtimestamp(obj, tz=self._tz).isoformat()
+        try:
+            return datetime.datetime.fromtimestamp(obj, tz=self._tz).isoformat()
+        except OSError as e:
+            raise construct.ConstructError(e)
 
 
 # Add common helpers

mwcp/utils/construct/windows_structures.py

@@ -321,10 +321,13 @@ def __init__(self, subcon, tzinfo=None):
         self._tzinfo = tzinfo
 
     def _decode(self, obj, context, path):
-        return datetime.datetime(
-            obj.wYear, obj.wMonth, obj.wDay, obj.wHour, obj.wMinute, obj.wSecond, obj.wMilliseconds * 1000,
-            tzinfo=self._tzinfo
-        ).isoformat()
+        try:
+            return datetime.datetime(
+                obj.wYear, obj.wMonth, obj.wDay, obj.wHour, obj.wMinute, obj.wSecond, obj.wMilliseconds * 1000,
+                tzinfo=self._tzinfo
+            ).isoformat()
+        except OSError as e:
+            raise construct.ConstructError(e)
 
 
 # Add common helpers
@@ -356,9 +359,12 @@ def __init__(self, subcon, tz=None):
         self._tz = tz
 
     def _decode(self, obj, context, path):
-        return datetime.datetime.fromtimestamp(
-            (obj - EPOCH_AS_FILETIME) / HUNDREDS_OF_NANOSECONDS, tz=self._tz
-        ).isoformat()
+        try:
+            return datetime.datetime.fromtimestamp(
+                (obj - EPOCH_AS_FILETIME) / HUNDREDS_OF_NANOSECONDS, tz=self._tz
+            ).isoformat()
+        except OSError as e:
+            raise construct.ConstructError(e)
 
 
 # Add common helpers