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

fixed memory leaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-22 21:30:40 +00:00
parent 7a5c8ac45a
commit c4a25811cc
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/xpmdecod.cpp
View File

@@ -134,12 +134,14 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
wxImage wxXPMDecoder::ReadFile(wxInputStream& stream) wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
{ {
size_t length = stream.GetSize(); size_t length = stream.GetSize();
wxCHECK_MSG(length != 0, wxNullImage, wxT("Cannot read XPM from stream of unknown size")); wxCHECK_MSG( length != 0, wxNullImage,
wxT("Cannot read XPM from stream of unknown size") );
char *xpm_buffer = new char[length+1]; // use a smart buffer to be sure to free memory even when we return on
char *p, *q; // error
size_t i; wxCharBuffer buffer(length);
char *xpm_buffer = (char *)buffer.data();
if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR ) if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
return wxNullImage; return wxNullImage;
xpm_buffer[length] = '\0'; xpm_buffer[length] = '\0';
@@ -147,6 +149,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
/* /*
* Remove comments from the file: * Remove comments from the file:
*/ */
char *p, *q;
for (p = xpm_buffer; *p != '\0'; p++) for (p = xpm_buffer; *p != '\0'; p++)
{ {
if ( (*p == '"') || (*p == '\'') ) if ( (*p == '"') || (*p == '\'') )
@@ -180,7 +183,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
/* /*
* Remove unquoted characters: * Remove unquoted characters:
*/ */
i = 0; size_t i = 0;
for (p = xpm_buffer; *p != '\0'; p++) for (p = xpm_buffer; *p != '\0'; p++)
{ {
if ( *p != '"' ) if ( *p != '"' )
@@ -232,12 +235,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
*/ */
wxImage img = ReadData(xpm_lines); wxImage img = ReadData(xpm_lines);
delete[] xpm_buffer;
#ifdef __WIN16__ #ifdef __WIN16__
delete[] (char**) xpm_lines; delete[] (char**) xpm_lines;
#else #else
delete[] xpm_lines; delete[] xpm_lines;
#endif #endif
return img; return img;
} }
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS