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

check the return code of wxStream::Read() in wxImageHandler::DoCanRead()

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/imagiff.cpp
View File

@@ -230,12 +230,14 @@ int wxIFFDecoder::GetTransparentColour() const { return m_image->transparent; }
//
bool wxIFFDecoder::CanRead()
{
unsigned char buf[12] = "";
unsigned char buf[12];
m_f->Read(buf, 12);
m_f->SeekI(-12, wxFromCurrent);
if ( !m_f->Read(buf, WXSIZEOF(buf)) )
return FALSE;
return (memcmp(buf, "FORM", 4) == 0 && memcmp(buf+8, "ILBM", 4) == 0);
m_f->SeekI(-WXSIZEOF(buf), wxFromCurrent);
return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0);
}