From 0e0589e873169b5983c7b7f4c2bdd38b18b4a674 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 22 Mar 2006 14:12:48 +0000 Subject: [PATCH] fixed handling PNG errors accidentally broken in rev 1.46 (libpng would just abort on invalid files now); fixed huge memory leak when failing to load an invalid PNG git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imagpng.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 98d1979572..ab10f4b9e9 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -179,12 +179,14 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message) // from pngerror.c // so that the libpng doesn't send anything on stderr void -PNGLINKAGEMODE wx_png_error(png_structp WXUNUSED(png_ptr), png_const_charp message) +PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message) { - // JS: deliver it to wx_png_warning and don't perform any more actions: - // libpng will jump back to the calling function (LoadFile and SaveFile) - // and allow it to handle the error wx_png_warning(NULL, message); + + // we're not using libpng built-in jump buffer (see comment before + // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng + // would just abort + longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1); } } // extern "C" @@ -539,7 +541,7 @@ wxPNGHandler::LoadFile(wxImage *image, if (setjmp(wxinfo.jmpbuf)) goto error; - png_uint_32 i, width, height; + png_uint_32 i, width, height = 0; int bit_depth, color_type, interlace_type; png_read_info( png_ptr, info_ptr ); @@ -601,6 +603,9 @@ error: if ( lines ) { + for ( unsigned int n = 0; n < height; n++ ) + free( lines[n] ); + free( lines ); } -- 2.45.2