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/imagtiff.cpp
View File

@@ -370,11 +370,13 @@ bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
{
unsigned char hdr[2];
stream.Read(&hdr, 2);
stream.SeekI(-2, wxFromCurrent);
if ( !stream.Read(&hdr, WXSIZEOF(hdr)) )
return FALSE;
return ((hdr[0] == 0x49 && hdr[1] == 0x49) ||
(hdr[0] == 0x4D && hdr[1] == 0x4D));
stream.SeekI(-WXSIZEOF(hdr), wxFromCurrent);
return (hdr[0] == 'I' && hdr[1] == 'I') ||
(hdr[0] == 'M' && hdr[1] == 'M');
}