Skip to content

PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust

M2.6: the JBIG2 cap's doc and test say what happens

Grzegorz Martens7d53e07f4330
diff --git a/crates/filters/src/jbig2/decode.rs b/crates/filters/src/jbig2/decode.rs
index 2ec9f97dd..320e02445 100644
--- a/crates/filters/src/jbig2/decode.rs
+++ b/crates/filters/src/jbig2/decode.rs
@@ -20,7 +20,8 @@ pub const MAX_JBIG2_PIXELS: u64 = 1 << 28;
///
/// Errors: `data` or `globals` that don't decode, or a page of another size
/// ([`FilterError::Corrupt`]); a page past `max` ([`FilterError::LimitExceeded`]) or
-/// [`MAX_JBIG2_PIXELS`] ([`FilterError::Unsupported`]).
+/// [`MAX_JBIG2_PIXELS`] ([`FilterError::Unsupported`], or `Corrupt` from the decoder, which has the
+/// same cap and can refuse the page first).
pub fn decode_jbig2(data: &[u8], globals: Option<&[u8]>, columns: u32, rows: u32, max: usize) -> Result<Vec<u8>, FilterError> {
if rows == 0 {
return Ok(Vec::new());
@@ -137,11 +138,11 @@ mod tests {
let page = 26 * h as usize;
assert!(matches!(decode_jbig2(&data, None, w, h, page - 1), Err(FilterError::LimitExceeded(m)) if m == page - 1), "a byte short");
assert_eq!(decode_jbig2(&data, None, w, h, page).unwrap().len(), page, "the page within max");
- // 16,384 × 16,384 is 2^28 pixels, and fails only later; a row more is past the cap, here or
- // in the decoder, which can refuse it first.
+ // 16,384 × 16,384 is 2^28 pixels, which decodes; a row more is past the cap, here or in the
+ // decoder, which has the same one and can refuse it first.
let large = |rows| decode_jbig2(&page_of(&data, 16_384, rows), None, 16_384, rows, usize::MAX);
assert!(matches!(large(16_385), Err(FilterError::Unsupported(_) | FilterError::Corrupt { .. })), "{:?}", large(16_385));
- assert!(!matches!(large(16_384), Err(FilterError::Unsupported(_))), "{:?}", large(16_384));
+ assert!(large(16_384).is_ok(), "{:?}", large(16_384).map(|page| page.len()));
// An extension segment (ISO/IEC 14492 7.4.14), which a decoder skips: its 11-byte header
// gives the length of the data after it.