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

don't free() the same pointer twice if an error occurs during lines pointers allocation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-02 13:50:30 +00:00
parent 13dcfd96b4
commit d473de688e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/imagpng.cpp
View File

@@ -558,18 +558,16 @@ wxPNGHandler::LoadFile(wxImage *image,
if (!image->Ok()) if (!image->Ok())
goto error; goto error;
lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) ); // initialize all line pointers to NULL to ensure that they can be safely
// free()d if an error occurs before all of them could be allocated
lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
if ( !lines ) if ( !lines )
goto error; goto error;
for (i = 0; i < height; i++) for (i = 0; i < height; i++)
{ {
if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL) if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
{
for ( unsigned int n = 0; n < i; n++ )
free( lines[n] );
goto error; goto error;
}
} }
png_read_image( png_ptr, lines ); png_read_image( png_ptr, lines );