Merge pull request #1781 from anfedotoff/master

Fix unbound allocation in fuzzer_script_exr

fuzz/fuzzers/fuzzer_script_exr.rs

@@ -1,45 +1,53 @@
 #![no_main]
-#[macro_use] extern crate libfuzzer_sys;
+#[macro_use]
+extern crate libfuzzer_sys;
 extern crate image;
 
-use std::io::Cursor;
-use image::ImageResult;
 use image::codecs::openexr::*;
-use std::io::Seek;
-use std::convert::TryFrom;
+use image::io::Limits;
+use image::ColorType;
 use image::ImageDecoder;
 use image::ImageEncoder;
-use image::ColorType;
-use std::io::Write;
+use image::ImageResult;
+use std::convert::TryFrom;
+use std::io::Cursor;
 use std::io::Read;
+use std::io::Seek;
+use std::io::Write;
 
 // "just dont panic"
 fn roundtrip(bytes: &[u8]) -> ImageResult<()> {
-
     /// Read the file from the specified path into an `Rgba32FImage`.
     // TODO this method should probably already exist in the main image crate
-    fn read_as_rgba_byte_image(read: impl Read + Seek) -> ImageResult<(u32,u32,Vec<u8>)> {
-        let decoder = OpenExrDecoder::with_alpha_preference(read, Some(true))?;
-        let (width, height) = decoder.dimensions();
-
-        let mut buffer = vec![0; usize::try_from(decoder.total_bytes()).unwrap()];
-        decoder.read_image(buffer.as_mut_slice())?;
-
-        Ok((width, height, buffer))
+    fn read_as_rgba_byte_image(read: impl Read + Seek) -> ImageResult<(u32, u32, Vec<u8>)> {
+        let mut decoder = OpenExrDecoder::with_alpha_preference(read, Some(true))?;
+        match usize::try_from(decoder.total_bytes()) {
+            Ok(decoded_size) if decoded_size <= 256 * 1024 * 1024 => {
+                decoder.set_limits(Limits::default())?;
+                let (width, height) = decoder.dimensions();
+                let mut buffer = vec![0; decoded_size];
+                decoder.read_image(buffer.as_mut_slice())?;
+                Ok((width, height, buffer))
+            }
+            _ => Err(image::ImageError::Limits(
+                image::error::LimitError::from_kind(
+                    image::error::LimitErrorKind::InsufficientMemory,
+                ),
+            )),
+        }
     }
 
     /// Write an `Rgba32FImage`.
     /// Assumes the writer is buffered. In most cases,
     /// you should wrap your writer in a `BufWriter` for best performance.
     // TODO this method should probably already exist in the main image crate
-    fn write_rgba_image(write: impl Write + Seek, (width, height, data): &(u32,u32,Vec<u8>)) -> ImageResult<()> {
-        OpenExrEncoder::new(write).write_image(
-            data.as_slice(), *width, *height,
-            ColorType::Rgba32F
-        )
+    fn write_rgba_image(
+        write: impl Write + Seek,
+        (width, height, data): &(u32, u32, Vec<u8>),
+    ) -> ImageResult<()> {
+        OpenExrEncoder::new(write).write_image(data.as_slice(), *width, *height, ColorType::Rgba32F)
     }
 
-
     let decoded_image = read_as_rgba_byte_image(Cursor::new(bytes))?;
 
     let mut bytes = Vec::with_capacity(bytes.len() + 20);
@@ -48,7 +56,10 @@ fn roundtrip(bytes: &[u8]) -> ImageResult<()> {
     let redecoded_image = read_as_rgba_byte_image(Cursor::new(bytes))?;
 
     // if both images are valid, assert read/write consistency
-    assert_eq!(decoded_image, redecoded_image, "image was valid but was not reproducible");
+    assert_eq!(
+        decoded_image, redecoded_image,
+        "image was valid but was not reproducible"
+    );
     Ok(())
 }