π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(image): report JPEG XL bounded-reader overflows as a limit error
laurensprieme666564eeb87
diff --git a/rust/crates/image/src/decode.rs b/rust/crates/image/src/decode.rsindex 0c482a8705..801f87ae7f 100644--- a/rust/crates/image/src/decode.rs+++ b/rust/crates/image/src/decode.rs@@ -33,6 +33,8 @@ use crate::{static IMAGE_DECODER_HOOKS_INIT: Once = Once::new();+const BOUNDED_READER_OVERFLOW_MESSAGE: &str = "JPEG XL input exceeds configured max_input_bytes";+const MAX_DECODE_PIXELS: u64 = 210_000_000;const MAX_DECODE_ALLOC_BYTES: u64 = 512 * 1024 * 1024;@@ -375,10 +377,16 @@ wherereader.rewind().map_err(image::ImageError::IoError)?;}- let decoder = JxlDecoder::new(BoundedReader::new(+ let decoder = match JxlDecoder::new(BoundedReader::new(reader,guardrails.max_input_bytes.unwrap_or(u64::MAX),- ))?;+ )) {+ Ok(decoder) => decoder,+ Err(image::ImageError::Decoding(err)) if bounded_reader_overflow(&err) => {+ return Err(too_large_limit_error());+ }+ Err(err) => return Err(err),+ };if let Some(max_pixels) = guardrails.max_pixels {let (width, height) = decoder.dimensions();@@ -390,6 +398,20 @@ whereOk(Box::new(decoder))}+fn bounded_reader_overflow(err: &image::error::DecodingError) -> bool {+ use std::error::Error as _;++ let mut source = err.source();+ while let Some(current) = source {+ if let Some(io_err) = current.downcast_ref::<std::io::Error>() {+ return io_err.kind() == std::io::ErrorKind::InvalidData+ && io_err.to_string().contains(BOUNDED_READER_OVERFLOW_MESSAGE);+ }+ source = current.source();+ }+ false+}+fn too_large_limit_error() -> image::ImageError {image::ImageError::Limits(image::error::LimitError::from_kind(image::error::LimitErrorKind::InsufficientMemory,@@ -416,7 +438,7 @@ impl<R: Read> Read for BoundedReader<R> {if count as u64 > self.bytes_left {return Err(std::io::Error::new(std::io::ErrorKind::InvalidData,- "JPEG XL input exceeds configured max_input_bytes",+ BOUNDED_READER_OVERFLOW_MESSAGE,));}self.bytes_left -= count as u64;@@ -632,7 +654,7 @@ fn bytes_look_like_heif(image_bytes: &[u8]) -> bool {mod tests {use std::{ffi::OsStr,- io::{Cursor, Read},+ io::{Cursor, Read, Seek, SeekFrom},};use image::hooks::decoding_hook_registered;@@ -1066,6 +1088,46 @@ mod tests {assert!(matches!(decoder.err(), Some(image::ImageError::Limits(_))));}+ struct UnderreportingReader {+ remaining: usize,+ }++ impl Read for UnderreportingReader {+ fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {+ let count = buf.len().min(self.remaining);+ buf[..count].fill(0);+ self.remaining -= count;+ Ok(count)+ }+ }++ impl Seek for UnderreportingReader {+ fn seek(&mut self, pos: SeekFrom) -> std::io::Result<u64> {+ match pos {+ SeekFrom::End(0) => Ok(4),+ SeekFrom::Start(0) => {+ self.remaining = 16;+ Ok(0)+ }+ _ => Err(std::io::Error::new(+ std::io::ErrorKind::Unsupported,+ "unsupported seek",+ )),+ }+ }+ }++ #[test]+ fn rejects_jxl_inputs_exceeding_the_input_cap_when_the_source_underreports_its_length() {+ let guardrails = jxl_hook_guardrails(Some(4), None);++ let decoder = super::jxl_decoder_from_reader_with_guardrails(+ UnderreportingReader { remaining: 16 },+ &guardrails,+ );+ assert!(matches!(decoder.err(), Some(image::ImageError::Limits(_))));+ }+#[test]fn rejects_jxl_inputs_exceeding_the_production_cap_through_the_public_path() {let temp = tempfile::Builder::new().suffix(".jxl").tempfile().unwrap();