fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / imagiff.cpp

diff --git a/src/common/imagiff.cpp b/src/common/imagiff.cpp
index bf214b15c84d7bd6fd848d86c2d90d2790525178..635758c559d8e142c60adab30d62866d76c8865c 100644 (file)
--- a/src/common/imagiff.cpp
+++ b/src/common/imagiff.cpp
@@ -81,7 +81,6 @@ private:
     IFFImage *m_image;        // image data
     wxInputStream *m_f;       // input stream
     unsigned char *databuf;
     IFFImage *m_image;        // image data
     wxInputStream *m_f;       // input stream
     unsigned char *databuf;

-    unsigned char *picptr;

     unsigned char *decomp_mem;
 
     void Destroy();
     unsigned char *decomp_mem;
 
     void Destroy();


@@ -140,7 +139,7 @@ bool wxIFFDecoder::ConvertToImage(wxImage *image) const
     // create the image
     image->Create(GetWidth(), GetHeight());
 
     // create the image
     image->Create(GetWidth(), GetHeight());
 

-    if (!image->Ok())
+    if (!image->IsOk())

         return false;
 
     unsigned char *pal = GetPalette();
         return false;
 
     unsigned char *pal = GetPalette();


@@ -546,7 +545,7 @@ int wxIFFDecoder::ReadIFF()
         }
 
         m_image->p = new byte[bmhd_width * bmhd_height * 3];
         }
 
         m_image->p = new byte[bmhd_width * bmhd_height * 3];

-            byte *picptr = m_image->p;
+        byte *picptr = m_image->p;

         if (!picptr) {
         Destroy();
         return wxIFF_MEMERR;
         if (!picptr) {
         Destroy();
         return wxIFF_MEMERR;