Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Reject EXIF offsets beyond 18 hours

Max Mittelstädte981b25e06de
diff --git a/crates/meta/src/datetime.rs b/crates/meta/src/datetime.rs
index 4b7d09634..bdc42dafb 100644
--- a/crates/meta/src/datetime.rs
+++ b/crates/meta/src/datetime.rs
@@ -74,7 +74,7 @@ impl DateTime {
None if rest.len() == 4 => (num(rest.get(..2)?)?, num(rest.get(2..)?)?),
None => (num(rest)?, 0),
};
- if h > 18 || m > 59 {
+ if h > 18 || m > 59 || (h == 18 && m > 0) {
return None;
}
Some(sign * (h * 60 + m) as i16)
@@ -185,6 +185,10 @@ mod tests {
assert_eq!(DateTime::parse_offset("-05:30"), Some(-330));
assert_eq!(DateTime::parse_offset("Z"), Some(0));
assert_eq!(DateTime::parse_offset("+0930"), Some(570));
+ assert_eq!(DateTime::parse_offset("+18:00"), Some(1080));
+ assert_eq!(DateTime::parse_offset("-18:00"), Some(-1080));
+ assert_eq!(DateTime::parse_offset("+18:01"), None);
+ assert_eq!(DateTime::parse_offset("-18:01"), None);
assert_eq!(DateTime::parse_offset(" : "), None);
assert_eq!(DateTime::parse_offset("+99:00"), None);
}