Skip to content

Commit 995d0d0

Browse files
committed
apply PR of Use checked arithmetic for addition to Unix epoch. cberner#231
1 parent 6ff6110 commit 995d0d0

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/ll/request.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,8 @@ mod op {
413413
#[cfg(target_os = "macos")]
414414
match self.arg.valid & FATTR_CRTIME {
415415
0 => None,
416-
_ => Some(
417-
SystemTime::UNIX_EPOCH + Duration::new(self.arg.crtime, self.arg.crtimensec),
418-
),
416+
_ => SystemTime::UNIX_EPOCH
417+
.checked_add(Duration::new(self.arg.crtime, self.arg.crtimensec)),
419418
}
420419
#[cfg(not(target_os = "macos"))]
421420
None
@@ -424,9 +423,8 @@ mod op {
424423
#[cfg(target_os = "macos")]
425424
match self.arg.valid & FATTR_CHGTIME {
426425
0 => None,
427-
_ => Some(
428-
SystemTime::UNIX_EPOCH + Duration::new(self.arg.chgtime, self.arg.chgtimensec),
429-
),
426+
_ => SystemTime::UNIX_EPOCH
427+
.checked_add(Duration::new(self.arg.chgtime, self.arg.chgtimensec)),
430428
}
431429
#[cfg(not(target_os = "macos"))]
432430
None
@@ -435,10 +433,8 @@ mod op {
435433
#[cfg(target_os = "macos")]
436434
match self.arg.valid & FATTR_BKUPTIME {
437435
0 => None,
438-
_ => Some(
439-
SystemTime::UNIX_EPOCH
440-
+ Duration::new(self.arg.bkuptime, self.arg.bkuptimensec),
441-
),
436+
_ => SystemTime::UNIX_EPOCH
437+
.checked_add(Duration::new(self.arg.bkuptime, self.arg.bkuptimensec)),
442438
}
443439
#[cfg(not(target_os = "macos"))]
444440
None

0 commit comments

Comments
 (0)