LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Reject multiple GPX document roots
Max Mittelstädt4c4d322becee
diff --git a/crates/meta/src/gpx.rs b/crates/meta/src/gpx.rsindex 204e39116..c59d41138 100644--- a/crates/meta/src/gpx.rs+++ b/crates/meta/src/gpx.rs@@ -101,6 +101,7 @@ pub fn parse_gpx(s: &str) -> Result<Tracklog, GpxError> {reader.config_mut().check_end_names = true;let mut path: Vec<Vec<u8>> = Vec::new();let mut seen_gpx = false;+ let mut seen_root = false;let mut log = Tracklog::default();let mut segment: u32 = 0;let mut pt: Option<Pending> = None;@@ -111,6 +112,12 @@ pub fn parse_gpx(s: &str) -> Result<Tracklog, GpxError> {Event::Start(ref e) | Event::Empty(ref e) => {let name = local(e.name().as_ref()).to_vec();let parent = path.last().map(Vec::as_slice);+ if path.is_empty() {+ if seen_root {+ return Err(GpxError::Xml("multiple document elements".into()));+ }+ seen_root = true;+ }match name.as_slice() {b"gpx" if path.is_empty() => seen_gpx = true,b"trk" if parent == Some(b"gpx") => log.tracks += 1,@@ -371,6 +378,11 @@ mod tests {assert!((g.longitude - -179.5).abs() < 1e-9, "{g:?}");}+ #[test]+ fn rejects_multiple_document_roots() {+ assert!(matches!(parse_gpx("<gpx/><gpx/>"), Err(GpxError::Xml(_))));+ }+#[test]fn rejects_non_gpx_and_bad_input() {assert_eq!(parse_gpx("<kml><Document/></kml>"), Err(GpxError::NotGpx));