Fix crash when reading PNG files with an invalid header (#385)

Removed assertions, as they prevent the expected `std::ios_base::failure` exception to be caught in such a case.
boostorg · Aug 26, 2019 · bd00f91 · bd00f91
1 parent 124f621
commit bd00f91
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/include/boost/gil/extension/io/png/detail/base.hpp b/include/boost/gil/extension/io/png/detail/base.hpp
@@ -62,12 +62,13 @@ struct png_struct_info_wrapper
     {
         if( png_ptr )
         {
-            BOOST_ASSERT(png_ptr->_struct && png_ptr->_info);
-
-            png_destroy_read_struct( &png_ptr->_struct
-                                   , &png_ptr->_info
-                                   , nullptr
-                                   );
+            if( png_ptr->_struct && png_ptr->_info )
+            {
+                png_destroy_read_struct( &png_ptr->_struct
+                                       , &png_ptr->_info
+                                       , nullptr
+                                       );
+            }
 
             delete png_ptr;
             png_ptr = nullptr;
@@ -78,11 +79,12 @@ struct png_struct_info_wrapper
     {
         if( png_ptr )
         {
-            BOOST_ASSERT(png_ptr->_struct && png_ptr->_info);
-
-            png_destroy_write_struct( &png_ptr->_struct
-                                    , &png_ptr->_info
-                                    );
+            if( png_ptr->_struct && png_ptr->_info )
+            {
+                png_destroy_write_struct( &png_ptr->_struct
+                                        , &png_ptr->_info
+                                        );
+            }
 
             delete png_ptr;
             png_ptr = nullptr;