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

26
src/common/imagbmp.cpp
View File

@@ -876,9 +876,13 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
{
unsigned char hdr[2];
stream.Read(hdr, 2);
stream.SeekI(-2, wxFromCurrent);
return (hdr[0] == 'B' && hdr[1] == 'M');
if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
return FALSE;
stream.SeekI(-WXSIZEOF(hdr), wxFromCurrent);
// do we have the BMP file signature?
return hdr[0] == 'B' && hdr[1] == 'M';
}
@@ -1259,7 +1263,7 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
//now either data or a FCC
if ( (FCC1 == *riff32) || (FCC1 == *list32) )
{
stream.Read(&FCC2, 4);
stream.Read(&FCC2, 4);
}
else
{
@@ -1305,11 +1309,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
return TRUE;
// we always have a data size:
stream.Read(&datalen, 4);
datalen = wxINT32_SWAP_ON_BE(datalen) ;
datalen = wxINT32_SWAP_ON_BE(datalen) ;
// now either data or a FCC:
if ( (FCC1 == *riff32) || (FCC1 == *list32) )
{
stream.Read(&FCC2, 4);
stream.Read(&FCC2, 4);
}
else
{
@@ -1317,7 +1321,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
}
// try to read next data chunk:
stream.Read(&FCC1, 4);
if ( !stream.Read(&FCC1, 4) )
{
// reading failed -- either EOF or IO error, bail out anyhow
return FALSE;
}
}
return FALSE;
@@ -1348,8 +1356,8 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
datalen = wxINT32_SWAP_ON_BE(datalen) ;
// now either data or a FCC:
if ( (FCC1 == *riff32) || (FCC1 == *list32) )
{
stream.Read(&FCC2, 4);
{
stream.Read(&FCC2, 4);
}
else
{