Add check for invalid concrete time dates

pantsbuild · Jul 14, 2020 · 1781198 · 1781198
1 parent 2fd1955
commit 1781198
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/rust/engine/Cargo.lock b/src/rust/engine/Cargo.lock
diff --git a/src/rust/engine/concrete_time/Cargo.toml b/src/rust/engine/concrete_time/Cargo.toml
@@ -9,3 +9,4 @@ publish = false
 protobuf = { version = "2.0.6", features = ["with-bytes"] }
 serde_derive = "1.0.98"
 serde = "1.0.98"
+log = "0.4"
diff --git a/src/rust/engine/concrete_time/src/lib.rs b/src/rust/engine/concrete_time/src/lib.rs
@@ -102,7 +102,14 @@ impl TimeSpan {
     end: &std::time::SystemTime,
   ) -> TimeSpan {
     let start = Self::since_epoch(start);
-    let duration = Self::since_epoch(end) - start;
+    let end = Self::since_epoch(end);
+    let duration = match end.checked_sub(start) {
+      Some(d) => d,
+      None => {
+        log::warn!("Invalid TimeSpan - start: {:?}, end: {:?}", start, end);
+        std::time::Duration::new(0, 0)
+      }
+    };
     TimeSpan {
       start: start.into(),
       duration: duration.into(),