Merge pull request #1613 from storytold/codex/shared-webp-inspection

Share WebP header inspection
This commit is contained in:
FredApps
2026-11-16 00:54:11 +01:00
committed by GitHub
2 changed files with 60 additions and 0 deletions
+1
View File
@@ -35,6 +35,7 @@ pub mod resolution;
pub mod source_settings;
pub mod tiff_probe;
pub mod web;
pub mod webp_probe;
pub use crate::allocation::{probe_allocation_size, probe_stored_size};
pub use crate::cicp::Cicp;
pub use crate::cicp::ContentLightLevel;
+59
View File
@@ -0,0 +1,59 @@
//! Header-only WebP inspection with image-chunk completeness checks.
use crate::{CodecError, Format};
/// Stored width, height and EXIF orientation without decoding pixels. The image payload must
/// fit in the input, but its compressed contents are not validated. Uses the default decode limits.
pub fn header(bytes: &[u8]) -> Result<(u32, u32, u16), CodecError> {
let err = |s: &str| CodecError::malformed(Format::WebP, s);
let mut p = 12usize;
let mut has_image = false;
let mut exif = None;
while let Some(h) = bytes.get(p..p.saturating_add(8)) {
let size = u32::from_le_bytes([h[4], h[5], h[6], h[7]]) as usize;
let end = p.saturating_add(8).saturating_add(size);
if matches!(&h[..4], b"VP8 " | b"VP8L" | b"ANMF") {
if end > bytes.len() {
return Err(err("truncated image data"));
}
has_image = true;
} else if &h[..4] == b"EXIF" && end <= bytes.len() && exif.is_none() {
exif = bytes.get(p + 8..end);
}
p = end.saturating_add(size & 1);
}
if !has_image {
return Err(err("no image data"));
}
let (w, h) = crate::probe_size(bytes)?;
let orientation = exif.map_or(1, craft_metadata::compat_orientation::orientation);
let (w, h) = if (5..=8).contains(&orientation) { (h, w) } else { (w, h) };
Ok((w, h, orientation))
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn preserves_stored_dimensions_with_exif_orientation() {
let mut image = crate::Image::from_u8(2, 3, crate::ChannelLayout::Rgb, vec![42; 18]).unwrap();
image.meta.exif = Some(b"II\x2a\x00\x08\x00\x00\x00\x01\x00\x12\x01\x03\x00\x01\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00".to_vec());
let mut bytes = crate::encode(&image, Format::WebP, &crate::EncodeOptions::default()).unwrap();
// The writer correctly makes exported pixels upright; simulate a camera file carrying orientation 6.
let exif = bytes.windows(4).position(|v| v == b"EXIF").unwrap();
let tiff = exif + 8;
bytes[tiff + 18] = 6;
assert_eq!(header(&bytes).unwrap(), (2, 3, 6));
}
#[test]
fn rejects_missing_and_truncated_image_chunks() {
let mut bytes = b"RIFF\x00\x00\x00\x00WEBP".to_vec();
assert!(header(&bytes).is_err());
bytes.extend_from_slice(b"VP8 ");
bytes.extend_from_slice(&10u32.to_le_bytes());
bytes.push(0);
assert!(header(&bytes).is_err());
}
}