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

two more ReadGIF tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-30 18:53:40 +00:00
parent 8862315bb9
commit aeaa24d421
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/gifdecod.cpp
View File

@@ -803,7 +803,7 @@ int wxGIFDecoder::ReadGIF()
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 (pimg->w == 0 || pimg->h == 0) if ((pimg->w <= 0) || (pimg->w > maxScreenSize) || (pimg->h <= 0) || (pimg->h > maxScreenSize))
{ {
Destroy(); Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;
@@ -835,8 +835,9 @@ int wxGIFDecoder::ReadGIF()
{ {
ncolors = 2 << (buf[8] & 0x07); ncolors = 2 << (buf[8] & 0x07);
size_t numBytes = 3 * ncolors; size_t numBytes = 3 * ncolors;
if (numBytes > 0)
m_f->Read(pimg->pal, numBytes); m_f->Read(pimg->pal, numBytes);
if (m_f->LastRead() != numBytes) if ((numBytes <= 0) || (m_f->LastRead() != numBytes))
{ {
Destroy(); Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;