ensure that image data is always freed by using wxON_BLOCK_EXIT in ReadTGA() (coverit...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/imagtga.cpp b/src/common/imagtga.cpp
index 281682cbb9f6773bdcb49d090d1011a649abfeae..6d65dd788929cad8b8961ce84ce6d51b8a61b747 100644 (file)
--- a/src/common/imagtga.cpp
+++ b/src/common/imagtga.cpp
@@ -30,6 +30,7 @@
 
 #include "wx/imagtga.h"
 #include "wx/log.h"
 
 #include "wx/imagtga.h"
 #include "wx/log.h"

+#include "wx/scopeguard.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -187,6 +188,8 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
         return wxTGA_MEMERR;
     }
 
         return wxTGA_MEMERR;
     }
 

+    wxON_BLOCK_EXIT1(free, imageData);
+

     unsigned char *dst = image->GetData();
 
     unsigned char* alpha = NULL;
     unsigned char *dst = image->GetData();
 
     unsigned char* alpha = NULL;


@@ -626,8 +629,6 @@ int ReadTGA(wxImage* image, wxInputStream& stream)
             return wxTGA_INVFORMAT;
     }
 
             return wxTGA_INVFORMAT;
     }
 

-    free(imageData);
-

     return wxTGA_OK;
 }
 
     return wxTGA_OK;
 }