Merge pull request #384 from image-rs/renovate-decode-iteration

Fix decode example/fuzz with new iteration

examples/decode.rs

@@ -13,17 +13,17 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut data = DecodingSampleBuffer::I8(vec![]);
 
     for i in 0u32.. {
+        if !reader.more_images() {
+            break;
+        }
+
+        reader.next_directory()?;
+
         let colortype = reader.colortype()?;
         let dimensions = reader.dimensions()?;
         let layout = reader.read_image_to_buffer(&mut data)?;
 
         debug_planes(i, &mut data, &layout, &colortype, dimensions);
-
-        if !reader.more_images() {
-            break;
-        }
-
-        reader.next_image()?
     }
 
     Ok(())

fuzz/fuzz_targets/decode_image.rs

@@ -2,7 +2,7 @@
 use libfuzzer_sys::fuzz_target;
 
 fuzz_target!(|data: &[u8]| {
-    let mut decoder = if let Ok(d) = tiff::decoder::Decoder::new(std::io::Cursor::new(data)) {
+    let mut decoder = if let Ok(d) = tiff::decoder::Decoder::open(std::io::Cursor::new(data)) {
         d
     } else {
         return;
@@ -16,16 +16,14 @@ fuzz_target!(|data: &[u8]| {
     decoder = decoder.with_limits(limits);
     
     loop {
-        if let Err(_) = decoder.read_image() {
-            break;
-        }
-
         if !decoder.more_images() {
             break;
         }
 
-        if let Err(_) = decoder.next_image() {
+        if let Err(_) = decoder.next_directory() {
             break;
         }
+
+        let _ = decoder.read_image();
     }
 });