commit dcd3edaf87fe019cb345e1127d52d54d5a9c8ab6
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Sep 02 16:13:15 2017 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Sep 02 16:13:15 2017 -0500
tree b04f7e354eac6a8e42a983e4cf0d3a9e8b0eeefe
parent 84a5bf83ff7968dca31e9b32bbe7e0ebab9b724c

[libpng16] Restored part of ~PngObjectHandler() that was deleted from

contrib/oss-fuzz/libpng_read_fuzzer.cc

contrib/oss-fuzz/libpng_read_fuzzer.cc

diff --git a/contrib/oss-fuzz/libpng_read_fuzzer.cc b/contrib/oss-fuzz/libpng_read_fuzzer.cc
index 1445f81..c3f4937 100644
--- a/contrib/oss-fuzz/libpng_read_fuzzer.cc
+++ b/contrib/oss-fuzz/libpng_read_fuzzer.cc
@@ -36,6 +36,16 @@
   BufState* buf_state = nullptr;
 
   ~PngObjectHandler() {
+    if (png_handler.row_ptr)
+      png_free(png_handler.png_ptr, png_handler.row_ptr);
+    if (png_handler.end_info_ptr)
+      png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr,
+        &png_handler.end_info_ptr);
+    else if (png_handler.info_ptr) 
+      png_destroy_read_struct(&png_handler.png_ptr, &png_handler.info_ptr,
+        nullptr);
+    else
+      png_destroy_read_struct(&png_handler.png_ptr, nullptr, nullptr);
     delete buf_state;
   }
 };