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

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

diff --git a/src/common/imagall.cpp b/src/common/imagall.cpp
index aaf6d459c78a3868eef60279aba8a9312a0d90a3..87bac918c2a26f4d823ead73ca19cb8e1c70c0fb 100644 (file)
--- a/src/common/imagall.cpp
+++ b/src/common/imagall.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        imagall.cpp
+// Name:        src/common/imagall.cpp
 // Purpose:     wxImage access all handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
@@ -7,26 +7,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-*/
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_IMAGE
+
 #ifndef WX_PRECOMP
-#  include "wx/setup.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-
-#if wxUSE_IMAGE
-
 //-----------------------------------------------------------------------------
 // This function allows dynamic access to all image handlers compile within
 // the library. This function should be in a separate file as some compilers
@@ -60,11 +53,10 @@ void wxInitAllImageHandlers()
   wxImage::AddHandler( new wxCURHandler );
   wxImage::AddHandler( new wxANIHandler );
 #endif
-#if wxUSE_XPM && (defined(__WXGTK__) || defined(__WXMOTIF__))
-  // NB: keep this #ifdef in sync with the one in image.cpp
-  //     (wxImage::InitStandardHandlers) - they must complement each other
-  //     so that there's always exactly one XPM handler added after calling
-  //     wxInitAllImageHandlers()
+#if wxUSE_TGA
+  wxImage::AddHandler( new wxTGAHandler );
+#endif
+#if wxUSE_XPM
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 }