about summary refs log tree commit diff
path: root/src/libstd/sys/wasm
diff options
context:
space:
mode:
authorSebastian Geisler <sebastian@blockstream.io>2018-10-30 22:24:33 -0700
committerSebastian Geisler <sebastian@blockstream.io>2018-11-15 22:55:24 -0800
commit6d40b7232eaa00ab5c060582011f350725703a1e (patch)
treef2e1c25c92d32bb635a8df1792e96c32cec199bb /src/libstd/sys/wasm
parente8aef7cae14bc7a56859408c90253e9bcc07fcff (diff)
downloadrust-6d40b7232eaa00ab5c060582011f350725703a1e.tar.gz
rust-6d40b7232eaa00ab5c060582011f350725703a1e.zip
Implement checked_add_duration for SystemTime
Since SystemTime is opaque there is no way to check if the result
of an addition will be in bounds. That makes the Add<Duration>
trait completely unusable with untrusted data. This is a big problem
because adding a Duration to UNIX_EPOCH is the standard way of
constructing a SystemTime from a unix timestamp.

This commit implements checked_add_duration(&self, &Duration) -> Option<SystemTime>
for std::time::SystemTime and as a prerequisite also for all platform
specific time structs. This also led to the refactoring of many
add_duration(&self, &Duration) -> SystemTime functions to avoid
redundancy (they now unwrap the result of checked_add_duration).

Some basic unit tests for the newly introduced function were added
too.
Diffstat (limited to 'src/libstd/sys/wasm')
-rw-r--r--src/libstd/sys/wasm/time.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/sys/wasm/time.rs b/src/libstd/sys/wasm/time.rs
index e52435e6339..991e8176edf 100644
--- a/src/libstd/sys/wasm/time.rs
+++ b/src/libstd/sys/wasm/time.rs
@@ -51,6 +51,10 @@ impl SystemTime {
         SystemTime(self.0 + *other)
     }
 
+    pub fn checked_add_duration(&self, other: &Duration) -> Option<SystemTime> {
+        self.0.checked_add(*other).map(|d| SystemTime(d))
+    }
+
     pub fn sub_duration(&self, other: &Duration) -> SystemTime {
         SystemTime(self.0 - *other)
     }