Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-22 14:12:48 +00:00
parent e1204086ba
commit 0e0589e873
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/imagpng.cpp
View File

@@ -179,12 +179,14 @@ PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
// from pngerror.c // from pngerror.c
// so that the libpng doesn't send anything on stderr // so that the libpng doesn't send anything on stderr
void 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); 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" } // extern "C"
@@ -539,7 +541,7 @@ wxPNGHandler::LoadFile(wxImage *image,
if (setjmp(wxinfo.jmpbuf)) if (setjmp(wxinfo.jmpbuf))
goto error; goto error;
png_uint_32 i, width, height; png_uint_32 i, width, height = 0;
int bit_depth, color_type, interlace_type; int bit_depth, color_type, interlace_type;
png_read_info( png_ptr, info_ptr ); png_read_info( png_ptr, info_ptr );
@@ -601,6 +603,9 @@ error:
if ( lines ) if ( lines )
{ {
for ( unsigned int n = 0; n < height; n++ )
free( lines[n] );
free( lines ); free( lines );
} }