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

fixed memory leaks when reading invalid GIFs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-30 16:22:15 +00:00
parent dda522bf4f
commit 56ba039411
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/gifdecod.cpp
View File

@@ -24,6 +24,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "wx/gifdecod.h" #include "wx/gifdecod.h"
#include "wx/ptr_scpd.h"
#include "wx/scopeguard.h"
@@ -52,6 +54,8 @@ public:
DECLARE_NO_COPY_CLASS(GIFImage) DECLARE_NO_COPY_CLASS(GIFImage)
}; };
wxDECLARE_SCOPED_PTR(GIFImage, GIFImagePtr)
wxDEFINE_SCOPED_PTR(GIFImage, GIFImagePtr)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -730,22 +734,18 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
if (type == 0x2C) if (type == 0x2C)
{ {
// allocate memory for IMAGEN struct // allocate memory for IMAGEN struct
GIFImage *pimg = new GIFImage(); GIFImagePtr pimg(new GIFImage());
if (pimg == NULL) wxScopeGuard guardDestroy = wxMakeObjGuard(*this, &wxGIFDecoder::Destroy);
{
Destroy(); if ( !pimg.get() )
return wxGIF_MEMERR; return wxGIF_MEMERR;
}
// fill in the data // fill in the data
static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1); static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1);
stream.Read(buf, idbSize); stream.Read(buf, idbSize);
if (stream.LastRead() != idbSize) if (stream.LastRead() != idbSize)
{
Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;
}
pimg->left = buf[0] + 256 * buf[1]; pimg->left = buf[0] + 256 * buf[1];
pimg->top = buf[2] + 256 * buf[3]; pimg->top = buf[2] + 256 * buf[3];
@@ -756,12 +756,9 @@ 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 (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();
return wxGIF_INVFORMAT; 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;
@@ -775,10 +772,7 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
pimg->pal = (unsigned char *) malloc(768); pimg->pal = (unsigned char *) malloc(768);
if ((!pimg->p) || (!pimg->pal)) if ((!pimg->p) || (!pimg->pal))
{
Destroy();
return wxGIF_MEMERR; return wxGIF_MEMERR;
}
// load local color map if available, else use global map // load local color map if available, else use global map
if ((buf[8] & 0x80) == 0x80) if ((buf[8] & 0x80) == 0x80)
@@ -788,10 +782,7 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
stream.Read(pimg->pal, numBytes); stream.Read(pimg->pal, numBytes);
pimg->ncolours = local_ncolors; pimg->ncolours = local_ncolors;
if (stream.LastRead() != numBytes) if (stream.LastRead() != numBytes)
{
Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;
}
} }
else else
{ {
@@ -802,21 +793,17 @@ wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
// get initial code size from first byte in raster data // get initial code size from first byte in raster data
bits = (unsigned char)stream.GetC(); bits = (unsigned char)stream.GetC();
if (bits == 0) if (bits == 0)
{
Destroy();
return wxGIF_INVFORMAT; return wxGIF_INVFORMAT;
}
// decode image // decode image
wxGIFErrorCode result = dgif(stream, pimg, interl, bits); wxGIFErrorCode result = dgif(stream, pimg.get(), interl, bits);
if (result != wxGIF_OK) if (result != wxGIF_OK)
{
Destroy();
return result; return result;
}
guardDestroy.Dismiss();
// add the image to our frame array // add the image to our frame array
m_frames.Add((void*)pimg); m_frames.Add(pimg.release());
m_nFrames++; m_nFrames++;
// if this is not an animated GIF, exit after first image // if this is not an animated GIF, exit after first image