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

fixed crash in XPM decoder when reading non XPM files

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-20 01:18:08 +00:00
parent e623926d63
commit 8a5b9745fb
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/xpmdecod.cpp
View File

@@ -137,7 +137,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
size_t i; size_t i;
if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR ) if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
return FALSE; return wxNullImage;
/* /*
* Remove comments from the file: * Remove comments from the file:
@@ -203,6 +203,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
lines_cnt++; lines_cnt++;
} }
if ( !lines_cnt )
{
// this doesn't really look an XPM image
return wxNullImage;
}
xpm_lines = new const char*[lines_cnt]; xpm_lines = new const char*[lines_cnt];
xpm_lines[0] = xpm_buffer; xpm_lines[0] = xpm_buffer;
line = 1; line = 1;