Fix deserialization of negative timestamps

chronotope · Jul 21, 2023 · 4f9f292 · 4f9f292
1 parent c9b554f
commit 4f9f292
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/src/datetime/serde.rs b/src/datetime/serde.rs
@@ -224,7 +224,10 @@ pub mod ts_nanoseconds {
             E: de::Error,
         {
             serde_from(
-                Utc.timestamp_opt(value / 1_000_000_000, (value % 1_000_000_000) as u32),
+                Utc.timestamp_opt(
+                    value.div_euclid(1_000_000_000),
+                    (value.rem_euclid(1_000_000_000)) as u32,
+                ),
                 &value,
             )
         }
@@ -480,7 +483,10 @@ pub mod ts_microseconds {
             E: de::Error,
         {
             serde_from(
-                Utc.timestamp_opt(value / 1_000_000, ((value % 1_000_000) * 1_000) as u32),
+                Utc.timestamp_opt(
+                    value.div_euclid(1_000_000),
+                    (value.rem_euclid(1_000_000) * 1_000) as u32,
+                ),
                 &value,
             )
         }
@@ -734,7 +740,7 @@ pub mod ts_milliseconds {
         where
             E: de::Error,
         {
-            serde_from(Utc.timestamp_opt(value / 1000, ((value % 1000) * 1_000_000) as u32), &value)
+            serde_from(Utc.timestamp_millis_opt(value), &value)
         }
 
         /// Deserialize a timestamp in milliseconds since the epoch
@@ -923,8 +929,7 @@ pub mod ts_seconds {
     use serde::{de, ser};
 
     use super::{serde_from, SecondsTimestampVisitor};
-    use crate::offset::TimeZone;
-    use crate::{DateTime, Utc};
+    use crate::{DateTime, LocalResult, TimeZone, Utc};
 
     /// Serialize a UTC datetime into an integer number of seconds since the epoch
     ///
@@ -1003,7 +1008,14 @@ pub mod ts_seconds {
         where
             E: de::Error,
         {
-            serde_from(Utc.timestamp_opt(value as i64, 0), &value)
+            serde_from(
+                if value > i64::MAX as u64 {
+                    LocalResult::None
+                } else {
+                    Utc.timestamp_opt(value as i64, 0)
+                },
+                &value,
+            )
         }
     }
 }

diff --git a/src/naive/datetime/serde.rs b/src/naive/datetime/serde.rs
@@ -160,17 +160,20 @@ pub mod ts_nanoseconds {
         where
             E: de::Error,
         {
-            NaiveDateTime::from_timestamp_opt(value / 1_000_000_000, (value % 1_000_000_000) as u32)
-                .ok_or_else(|| E::custom(ne_timestamp(value)))
+            NaiveDateTime::from_timestamp_opt(
+                value.div_euclid(1_000_000_000),
+                (value.rem_euclid(1_000_000_000)) as u32,
+            )
+            .ok_or_else(|| E::custom(ne_timestamp(value)))
         }
 
         fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
         where
             E: de::Error,
         {
             NaiveDateTime::from_timestamp_opt(
-                value as i64 / 1_000_000_000,
-                (value as i64 % 1_000_000_000) as u32,
+                (value / 1_000_000_000) as i64,
+                (value % 1_000_000_000) as u32,
             )
             .ok_or_else(|| E::custom(ne_timestamp(value)))
         }
@@ -414,11 +417,8 @@ pub mod ts_microseconds {
         where
             E: de::Error,
         {
-            NaiveDateTime::from_timestamp_opt(
-                value / 1_000_000,
-                ((value % 1_000_000) * 1000) as u32,
-            )
-            .ok_or_else(|| E::custom(ne_timestamp(value)))
+            NaiveDateTime::from_timestamp_micros(value)
+                .ok_or_else(|| E::custom(ne_timestamp(value)))
         }
 
         fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E>
@@ -671,7 +671,7 @@ pub mod ts_milliseconds {
         where
             E: de::Error,
         {
-            NaiveDateTime::from_timestamp_opt(value / 1000, ((value % 1000) * 1_000_000) as u32)
+            NaiveDateTime::from_timestamp_millis(value)
                 .ok_or_else(|| E::custom(ne_timestamp(value)))
         }