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

always properly check if SeekI() calls succeded; this makes CanRead() functions of animation decoders return false for non-seekable streams (which is a wanted side-effect)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-13 19:16:08 +00:00
parent 2bc566539b
commit b81e450659
7 changed files with 110 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/anidecod.cpp
View File

@@ -127,7 +127,8 @@ bool wxANIDecoder::CanRead(wxInputStream& stream) const
wxInt32 anih32;
memcpy( &anih32, "anih", 4 );
stream.SeekI(0);
if ( stream.SeekI(0) == wxInvalidOffset )
return false;
if ( !stream.Read(&FCC1, 4) )
return false;
@@ -154,7 +155,8 @@ bool wxANIDecoder::CanRead(wxInputStream& stream) const
}
else
{
stream.SeekI(stream.TellI() + datalen);
if ( stream.SeekI(stream.TellI() + datalen) == wxInvalidOffset )
return false;
}
// try to read next data chunk:
@@ -220,8 +222,10 @@ bool wxANIDecoder::Load( wxInputStream& stream )
wxInt32 seq32;
memcpy( &seq32, "seq ", 4 );
stream.SeekI(0);
stream.Read(&FCC1, 4);
if ( stream.SeekI(0) == wxInvalidOffset)
return false;
if ( !stream.Read(&FCC1, 4) )
return false;
if ( FCC1 != riff32 )
return false;
@@ -309,11 +313,13 @@ bool wxANIDecoder::Load( wxInputStream& stream )
}
else
{
stream.SeekI(stream.TellI() + datalen);
if ( stream.SeekI(stream.TellI() + datalen) == wxInvalidOffset )
return false;
}
// try to read next data chunk:
stream.Read(&FCC1, 4);
if ( !stream.Read(&FCC1, 4) )
return false;
}
if (m_nFrames==0)