diff --git a/crates/mesh/src/fbx.rs b/crates/mesh/src/fbx.rs index 6c2d92e32..fcec50728 100644 --- a/crates/mesh/src/fbx.rs +++ b/crates/mesh/src/fbx.rs @@ -233,7 +233,7 @@ pub fn read_document(bytes: &[u8], limits: &Limits) -> Result { read_document_impl(bytes, limits, false) } -/// Read records with strict ASCII syntax checking for malformed strings and record delimiters. +/// Read records strictly, checking ASCII delimiters and the binary closing record. pub fn read_document_strict(bytes: &[u8], limits: &Limits) -> Result { read_document_impl(bytes, limits, true) } @@ -241,7 +241,7 @@ pub fn read_document_strict(bytes: &[u8], limits: &Limits) -> Result { fn read_document_impl(bytes: &[u8], limits: &Limits, strict: bool) -> Result { let budget = Budget::new(limits.max_data_bytes); let (version, records) = if is_binary(bytes) { - read_binary(bytes, &budget)? + read_binary(bytes, &budget, strict)? } else { let text = match std::str::from_utf8(bytes) { Ok(text) => std::borrow::Cow::Borrowed(text), @@ -415,20 +415,27 @@ fn object_name(b: &[u8]) -> String { } } -fn read_binary(bytes: &[u8], budget: &Budget) -> Result<(u32, Vec)> { +fn read_binary(bytes: &[u8], budget: &Budget, strict: bool) -> Result<(u32, Vec)> { let mut pos = BINARY_MAGIC.len(); let version = Bin { d: bytes, wide: false, budget }.u32(&mut pos)?; let bin = Bin { d: bytes, wide: version >= 7500, budget }; let mut records = vec![]; + let mut closed = false; while pos < bytes.len() { match bin.record(&mut pos, bytes.len(), 0) { Ok(Some(n)) => records.push(n), - Ok(None) => break, + Ok(None) => { + closed = true; + break; + } // A damaged tail (footer, padding) after complete sections is ignored. - Err(crate::Error::Malformed(_)) if records.iter().any(|n| n.name == "Objects") => break, + Err(crate::Error::Malformed(_)) if !strict && records.iter().any(|n| n.name == "Objects") => break, Err(e) => return Err(e), } } + if strict && !closed { + return Err(malformed(KIND, "missing binary closing record")); + } Ok((version, records)) } diff --git a/crates/mesh/src/tests/fbx.rs b/crates/mesh/src/tests/fbx.rs index 9541d67cb..b65643021 100644 --- a/crates/mesh/src/tests/fbx.rs +++ b/crates/mesh/src/tests/fbx.rs @@ -651,3 +651,13 @@ fn strict_ascii_reports_unbalanced_and_unterminated_records() { } assert!(read_document(b"Objects: { A: 1", &Limits::default()).is_ok()); } + +#[test] +fn strict_binary_requires_a_closing_record() { + let doc = document(ASCII.as_bytes()); + let bytes = write_binary(&doc.records, 7400, false); + assert!(crate::fbx::read_document_strict(&bytes, &Limits::default()).is_ok()); + let truncated = &bytes[..bytes.len() - 29]; + assert!(read_document(truncated, &Limits::default()).is_ok()); + assert!(crate::fbx::read_document_strict(truncated, &Limits::default()).is_err()); +}