Add XPM decoder

Author: mstoeckl

Cargo.toml

@@ -8,13 +8,15 @@ publish = false
 include = ["src", "tests/reference.rs"]
 
 [features]
-default = ["pcx", "xbm"]
+default = ["pcx", "xbm", "xpm"]
 pcx = ["dep:pcx"]
 xbm = []
+xpm = ["dep:x11r6colornames"]
 
 [dependencies]
 image = { version = "0.25.5", default-features = false }
 pcx = { version = "0.2.4", optional = true }
+x11r6colornames = { git = "https://github.com/mstoeckl/x11r6colornames.git", rev = "11a60d038ce2a1253a603be2c7eb45ee8d066264", version = "1.0.0", optional = true }
 
 [dev-dependencies]
 image = { version = "0.25.5", default-features = false, features = ["png"] }

README.md

@@ -7,6 +7,7 @@ Decoding support for additional image formats beyond those provided by the [`ima
 | --------- | -------------------- |
 | PCX | [Wikipedia](https://en.wikipedia.org/wiki/PCX#PCX_file_format) |
 | XBM | [Wikipedia](https://en.wikipedia.org/wiki/X_BitMap) |
+| XPM | [Wikipedia](https://en.wikipedia.org/wiki/X_PixMap) |
 
 ## New Formats
 

deny.toml

@@ -14,11 +14,14 @@ targets = [
 [licenses]
 confidence-threshold = 0.93
 allow = [
+    "0BSD",
     "Apache-2.0 WITH LLVM-exception",
     "Apache-2.0",
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "CC0-1.0",
     "MIT",
+    "X11",
     "MIT-0",
     "MPL-2.0",
     "Unicode-DFS-2016",

fuzz/Cargo.toml

@@ -14,7 +14,7 @@ image = { version = "0.25.5", default-features = false }
 
 [dependencies.image-extras]
 path = ".."
-features = ["xbm"]
+features = ["xbm", "xpm"]
 [dependencies.libfuzzer-sys]
 version = "0.4"
 
@@ -29,3 +29,7 @@ members = ["."]
 [[bin]]
 name = "fuzzer_script_xbm"
 path = "fuzzers/fuzzer_script_xbm.rs"
+
+[[bin]]
+name = "fuzzer_script_xpm"
+path = "fuzzers/fuzzer_script_xpm.rs"

fuzz/fuzzers/fuzzer_script_xpm.rs

@@ -0,0 +1,23 @@
+#![no_main]
+#[macro_use] extern crate libfuzzer_sys;
+extern crate image_extras;
+extern crate image;
+
+use std::io::BufReader;
+use image::ImageDecoder;
+
+fuzz_target!(|data: &[u8]| {
+    let reader = BufReader::new(data);
+    let Ok(mut decoder) = image_extras::xpm::XpmDecoder::new(reader) else {
+        return;
+    };
+    let mut limits = image::Limits::default();
+    limits.max_alloc = Some(1024 * 1024); // 1 MiB
+    if limits.reserve(decoder.total_bytes()).is_err() {
+        return;
+    }
+    if decoder.set_limits(limits).is_err() {
+        return;
+    }
+    let _ = std::hint::black_box(image::DynamicImage::from_decoder(decoder));
+});

src/lib.rs

@@ -21,6 +21,9 @@ pub mod pcx;
 #[cfg(feature = "xbm")]
 pub mod xbm;
 
+#[cfg(feature = "xpm")]
+pub mod xpm;
+
 /// Register all enabled extra formats with the image crate.
 pub fn register() {
     image::hooks::register_decoding_hook(
@@ -38,4 +41,10 @@ pub fn register() {
         "bm".into(),
         Box::new(|r| Ok(Box::new(xbm::XbmDecoder::new(r)?))),
     );
+
+    image::hooks::register_decoding_hook(
+        "xpm".into(),
+        Box::new(|r| Ok(Box::new(xpm::XpmDecoder::new(r)?))),
+    );
+    image::hooks::register_format_detection_hook("xpm".into(), b"/* XPM */", None);
 }