fixed crash in XPM decoder when reading non XPM files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e623926d63
commit
8a5b9745fb
@ -137,7 +137,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
|
||||
size_t i;
|
||||
|
||||
if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
|
||||
return FALSE;
|
||||
return wxNullImage;
|
||||
|
||||
/*
|
||||
* Remove comments from the file:
|
||||
@ -203,6 +203,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
|
||||
lines_cnt++;
|
||||
}
|
||||
|
||||
if ( !lines_cnt )
|
||||
{
|
||||
// this doesn't really look an XPM image
|
||||
return wxNullImage;
|
||||
}
|
||||
|
||||
xpm_lines = new const char*[lines_cnt];
|
||||
xpm_lines[0] = xpm_buffer;
|
||||
line = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user