diff --git a/Cargo.lock b/Cargo.lock index b821ec91..e1531265 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "craft-usd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=556d02941ad3b97b1d109e9c08d4477d647deb1f#556d02941ad3b97b1d109e9c08d4477d647deb1f" +source = "git+https://github.com/storytold/craft-libs?rev=456abf7b7a2e6919b5a16e35fa2bf4e796f88674#456abf7b7a2e6919b5a16e35fa2bf4e796f88674" dependencies = [ "lz4_flex", "thiserror 2.0.21", diff --git a/Cargo.toml b/Cargo.toml index f9890f38..a609cb19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ rust-version = "1.95" repository = "https://github.com/storytold/texturecraft" [workspace.dependencies] -craft-usd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "556d02941ad3b97b1d109e9c08d4477d647deb1f" } +craft-usd = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "456abf7b7a2e6919b5a16e35fa2bf4e796f88674" } # internal texturecraft-core = { path = "crates/core" } texturecraft-texel = { path = "crates/texel" } diff --git a/crates/formats/src/mesh_import/usd/codec.rs b/crates/formats/src/mesh_import/usd/codec.rs index f1e0e7ee..4d0f0343 100644 --- a/crates/formats/src/mesh_import/usd/codec.rs +++ b/crates/formats/src/mesh_import/usd/codec.rs @@ -119,43 +119,14 @@ pub(crate) fn encoded_ints_len(n: usize, width: usize) -> usize { if n == 0 { 0 } else { width.saturating_add(n.saturating_mul(2).saturating_add(7) / 8).saturating_add(n.saturating_mul(width)) } } -fn read_signed(b: &[u8], at: usize, width: usize) -> Option { - let s = b.get(at..at.checked_add(width)?)?; - Some(match width { - 1 => i64::from(i8::from_le_bytes(s.try_into().ok()?)), - 2 => i64::from(i16::from_le_bytes(s.try_into().ok()?)), - 4 => i64::from(i32::from_le_bytes(s.try_into().ok()?)), - _ => i64::from_le_bytes(s.try_into().ok()?), - }) -} - -/// Decode `n` integers of `width` (4 or 8) bytes; 32-bit values are sign-extended (reinterpret -/// as u32 for unsigned data). +/// Decode packed integers after the caller charges its aggregate decoded-byte budget. pub(crate) fn decode_ints(data: &[u8], n: usize, width: usize) -> Result> { - let err = || malformed(KIND, "truncated integer array"); - if n == 0 { - return Ok(Vec::new()); - } - let common = read_signed(data, 0, width).ok_or_else(err)?; - let codes_at = width; - let mut at = codes_at + n.div_ceil(4); - let mut out = Vec::with_capacity(n); - let mut prev = 0i64; - for i in 0..n { - let code = (data.get(codes_at + i / 4).ok_or_else(err)? >> (2 * (i % 4))) & 3; - let delta = match code { - 0 => common, - c => { - let w = (width >> (3 - c as usize)).max(1); - let v = read_signed(data, at, w).ok_or_else(err)?; - at += w; - v - } - }; - prev = if width == 4 { i64::from((prev as i32).wrapping_add(delta as i32)) } else { prev.wrapping_add(delta) }; - out.push(prev); - } - Ok(out) + let width = match width { + 4 => craft_usd::integers::Width::I32, + 8 => craft_usd::integers::Width::I64, + _ => return Err(malformed(KIND, "unsupported integer width")), + }; + craft_usd::integers::decode(data, n, width, super::MAX_DECODED_BYTES).map_err(|e| malformed(KIND, e.to_string())) } /// Encode integers of `width` (4 or 8) bytes (values must fit the width). diff --git a/crates/formats/src/mesh_import/usd/tests.rs b/crates/formats/src/mesh_import/usd/tests.rs index 8b85a611..cd77be5c 100644 --- a/crates/formats/src/mesh_import/usd/tests.rs +++ b/crates/formats/src/mesh_import/usd/tests.rs @@ -420,6 +420,13 @@ fn integer_coding_round_trips() { assert!(codec::decompress(&[0, 0xF0], 10).is_err()); } +#[test] +fn shared_integer_decoder_rejects_unsupported_width_and_oversized_output() { + assert!(codec::decode_ints(&[], 1, 3).is_err()); + assert!(codec::decode_ints(&[], super::MAX_DECODED_BYTES / 8 + 1, 8).is_err()); + assert!(codec::decode_ints(&[], 0, 4).unwrap().is_empty()); +} + #[test] fn shared_crate_lz4_retains_chunk_and_budget_policy() { let mut frame = vec![2];