check the return code of wxStream::Read() in wxImageHandler::DoCanRead()
and avoid reading uninitialized memory when it fails git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -126,10 +126,12 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
|
||||
{
|
||||
unsigned char buf[9];
|
||||
|
||||
stream.Read(buf, 9);
|
||||
stream.SeekI(-9, wxFromCurrent);
|
||||
if ( !stream.Read(buf, WXSIZEOF(buf)) )
|
||||
return FALSE;
|
||||
|
||||
return (memcmp(buf, "/* XPM */", 9) == 0);
|
||||
stream.SeekI(-WXSIZEOF(buf), wxFromCurrent);
|
||||
|
||||
return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
|
||||
}
|
||||
|
||||
wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
|
||||
|
||||
Reference in New Issue
Block a user