From 9afd3b24a6e3cb7910e32ce1c0bde59213d89b49 Mon Sep 17 00:00:00 2001 From: DavidKorczynski Date: Sun, 21 Mar 2021 02:45:29 +0000 Subject: [PATCH] Updated the image-png fuzzer. (#5457) --- projects/image-png/buf_independent.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/projects/image-png/buf_independent.rs b/projects/image-png/buf_independent.rs index 1d19bf182..f4a1f312c 100644 --- a/projects/image-png/buf_independent.rs +++ b/projects/image-png/buf_independent.rs @@ -3,7 +3,6 @@ extern crate libfuzzer_sys; use libfuzzer_sys::fuzz_target; extern crate png; -use std::mem::discriminant; use std::io::{BufRead, Read, Result}; /// A reader that reads at most `n` bytes. @@ -50,7 +49,7 @@ fuzz_target!(|data: &[u8]| { #[inline(always)] fn png_compare(reference: png::Decoder, smal: png::Decoder) - -> std::result::Result + -> std::result::Result { let mut smal = Some(smal); let (info, mut reference) = reference.read_info().map_err(|_| { @@ -67,11 +66,9 @@ fn png_compare(reference: png::Decoder, smal: png::De let mut ref_data = vec![0; info.buffer_size()]; let mut smal_data = vec![0; info.buffer_size()]; - use png::DecodingError::*; + let _rref = reference.next_frame(&mut ref_data); + let _rsmal = smal.next_frame(&mut smal_data); - loop { - let rref = reference.next_frame(&mut ref_data); - let rsmal = smal.next_frame(&mut smal_data); - } + assert_eq!(smal_data, ref_data); + return Ok(info); } -