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

Applied #9465 (Error reading GIF with incorrect animation size)

Browse Source 
By Marc Oldenhof 


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-27 11:09:52 +00:00
parent 7b44c10277
commit 3180db0c6d
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/gifdecod.cpp
View File

@@ -755,12 +755,38 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
pimg->w = buf[4] + 256 * buf[5]; pimg->w = buf[4] + 256 * buf[5];
pimg->h = buf[6] + 256 * buf[7]; pimg->h = buf[6] + 256 * buf[7];
#if 0
if (anim && ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) || if (anim && ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) ||
(pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight()))) (pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight())))
{ {
Destroy(); Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;
} }
#endif
if ( anim )
{
// some GIF images specify incorrect animation size but we can
// still open them if we fix up the animation size, see #9465
if ( m_nFrames == 0 )
{
if ( pimg->w > (unsigned)m_szAnimation.x )
m_szAnimation.x = pimg->w;
if ( pimg->h > (unsigned)m_szAnimation.y )
m_szAnimation.y = pimg->h;
}
else // subsequent frames
{
// check that we have valid size
if ( (!pimg->w || pimg->w > (unsigned)m_szAnimation.x) ||
(!pimg->h || pimg->h > (unsigned)m_szAnimation.y) )
{
wxLogError(_("Incorrect GIF frame size (%u, %d) for the frame #%u"),
pimg->w, pimg->h, m_nFrames);
Destroy();
return wxGIF_INVFORMAT;
}
}
}
interl = ((buf[8] & 0x40)? 1 : 0); interl = ((buf[8] & 0x40)? 1 : 0);
size = pimg->w * pimg->h; size = pimg->w * pimg->h;