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:
Vadim Zeitlin
2002-05-18 12:41:51 +00:00
parent baaae89f09
commit 79fa23744b
9 changed files with 55 additions and 33 deletions

View File

@@ -418,9 +418,12 @@ bool wxPNGHandler::DoCanRead( wxInputStream& stream )
{
unsigned char hdr[4];
stream.Read(hdr, 4);
stream.SeekI(-4, wxFromCurrent);
return (hdr[0] == 0x89 && hdr[1] == 'P' && hdr[2] == 'N' && hdr[3] == 'G');
if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
return FALSE;
stream.SeekI(-WXSIZEOF(hdr), wxFromCurrent);
return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0;
}
#endif // wxUSE_STREAMS