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

Fix clobbering warning

Browse Source
This commit is contained in:
pavel-t
2018-07-03 13:33:03 +03:00
parent 9acb2fe3a0
commit 99ea06203a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/imagpng.cpp
View File

@@ -256,7 +256,9 @@ wxPNGHandler::LoadFile(wxImage *image,
// VZ: as this function uses setjmp() the only fool-proof error handling // VZ: as this function uses setjmp() the only fool-proof error handling
// method is to use goto (setjmp is not really C++ dtors friendly...) // method is to use goto (setjmp is not really C++ dtors friendly...)
unsigned char **lines = NULL; // allocate the lines pointer dynamically to avoid clobbering by longjmp
unsigned char *** const lines_p = new unsigned char ** (NULL);
unsigned char ** &lines = *lines_p;
png_infop info_ptr = (png_infop) NULL; png_infop info_ptr = (png_infop) NULL;
wxPNGInfoStruct wxinfo; wxPNGInfoStruct wxinfo;
@@ -400,6 +402,7 @@ wxPNGHandler::LoadFile(wxImage *image,
for ( i = 0; i < height; i++ ) for ( i = 0; i < height; i++ )
free( lines[i] ); free( lines[i] );
free( lines ); free( lines );
delete lines_p;
return true; return true;
@@ -421,6 +424,7 @@ error:
free( lines ); free( lines );
} }
delete lines_p;
if ( png_ptr ) if ( png_ptr )
{ {