EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
PDF: repin craft-pdf, hayro-syntax and hayro-jbig2 to craft-libs 9f75d3dc for its xref, object-stream, graphics-state and JBIG2 input bounds (#2265)
aionggeb5108786b90
diff --git a/Cargo.lock b/Cargo.lockindex e3843272a..f99e09a06 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -985,7 +985,7 @@ source = "git+https://github.com/storytold/craft-libs?rev=82a24b006eefa036b43c09[[package]]name = "craft-pdf"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d#ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d"+source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"dependencies = ["hayro-syntax","thiserror 2.0.21",@@ -2726,8 +2726,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a"[[package]]name = "hayro-jbig2"version = "0.3.0"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "69374b3668dd45aeb3d3145cda68f2c7b4f223aaa2511e67d076f1c7d741388d"+source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"dependencies = ["hayro-ccitt",]@@ -2741,7 +2740,7 @@ checksum = "c75ab947623ef4ccaa7acf0579edf7cbb5a73838e3839a7be73335e522f433a1"[[package]]name = "hayro-syntax"version = "0.7.2"-source = "git+https://github.com/storytold/craft-libs?rev=ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d#ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d"+source = "git+https://github.com/storytold/craft-libs?rev=9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef#9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef"dependencies = ["hayro-jbig2","hayro-jpeg2000",diff --git a/Cargo.toml b/Cargo.tomlindex d71d29337..a3935f047 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -11,7 +11,7 @@ rust-version = "1.95"repository = "https://github.com/storytold/effectcraft"[workspace.dependencies]-craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d", version = "=0.1.0", default-features = false, features = ["read"] }+craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.1.0", default-features = false, features = ["read"] }craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }# internaleffectcraft-time = { path = "crates/time" }@@ -216,4 +216,5 @@ lto = "thin"codegen-units = 1[patch.crates-io]-hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d", version = "=0.7.2" }+hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.7.2" }+hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef", version = "=0.3.0" }diff --git a/crates/pdf/README.md b/crates/pdf/README.mdindex 1d6bf3c13..e4970edc9 100644--- a/crates/pdf/README.md+++ b/crates/pdf/README.md@@ -138,15 +138,17 @@ ffmpeg elsewhere) to check the code tables against an independent implementation## Shared parser setup and boundsThe workspace pins `craft-pdf` to `craft-libs` Git revision-`ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d`, with `default-features = false` and only the explicit `read`+`9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef`, with `default-features = false` and only the explicit `read`feature. This excludes the backend's bundled fonts and Adobe CMaps and preserves EffectCraft'sfont and asset policies. The shared parser does not change the supported drawing operators,image codecs, continuously rasterized SVG tree, editable shapes, or EPS interpreter.This revision removes an unchecked lazy-array read and preserves later values and pages aftersign-only numeric entries; the app exercises those inputs through its object adapter, public-page parser and rasterizer on native and WASM targets.+page parser and rasterizer on native and WASM targets. It also bounds xref, object-stream and+graphics-state work, reads the full `/W[0]` xref type width, and caps JBIG2 segment references+and bitmap allocation.-The root Cargo patch pins Hayro-syntax to the same `storytold/craft-libs` revision. `cargo xtask pdf-deps` checks this graph and refuses+The root Cargo patch pins Hayro-syntax and Hayro-jbig2 to the same `storytold/craft-libs` revision. `cargo xtask pdf-deps` checks this graph and refusesan enabled Hayro interpreter, rasterizer or CMap dependency. The shared revision must bepublished before a fresh app checkout can resolve it; no sibling checkout is required.diff --git a/xtask/src/pdf_deps.rs b/xtask/src/pdf_deps.rsindex d7f880796..d0efd830c 100644--- a/xtask/src/pdf_deps.rs+++ b/xtask/src/pdf_deps.rs@@ -5,8 +5,8 @@ use std::process::Command;use serde_json::Value;-const REV: &str = "ca50d63b773c99f96e75c77ce5a1d21e7c9cda0d";-const PACKAGES: &[(&str, &str)] = &[("craft-pdf", "0.1.0"), ("hayro-syntax", "0.7.2")];+const REV: &str = "9f75d3dc19b4b514c4f3d4847ed1ec1b0e86b4ef";+const PACKAGES: &[(&str, &str)] = &[("craft-pdf", "0.1.0"), ("hayro-syntax", "0.7.2"), ("hayro-jbig2", "0.3.0")];pub fn run(root: &Path) -> Result<(), String> {let output = Command::new(std::env::var_os("CARGO").unwrap_or_else(|| "cargo".into()))