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

ensure that image data is always freed by using wxON_BLOCK_EXIT in ReadTGA() (coverity id 202)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-27 15:01:58 +00:00
parent ffe3c9ed98
commit 566921195a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/imagtga.cpp
View File

@@ -30,6 +30,7 @@
#include "wx/imagtga.h" #include "wx/imagtga.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/scopeguard.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
@@ -187,6 +188,8 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
return wxTGA_MEMERR; return wxTGA_MEMERR;
} }
wxON_BLOCK_EXIT1(free, imageData);
unsigned char *dst = image->GetData(); unsigned char *dst = image->GetData();
unsigned char* alpha = NULL; unsigned char* alpha = NULL;
@@ -626,8 +629,6 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
return wxTGA_INVFORMAT; return wxTGA_INVFORMAT;
} }
free(imageData);
return wxTGA_OK; return wxTGA_OK;
} }