From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 22 Nov 2001 21:30:40 +0000 (+0000)
Subject: fixed memory leaks
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c4a25811ccd431aceae4523951061b202d4f2611

fixed memory leaks


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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index c4ad123d5c..6f593fc989 100644
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -134,12 +134,14 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
 wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
 {
     size_t length = stream.GetSize();
-    wxCHECK_MSG(length != 0, wxNullImage, wxT("Cannot read XPM from stream of unknown size"));
+    wxCHECK_MSG( length != 0, wxNullImage,
+                 wxT("Cannot read XPM from stream of unknown size") );
 
-    char *xpm_buffer = new char[length+1];
-    char *p, *q;
-    size_t i;
+    // use a smart buffer to be sure to free memory even when we return on
+    // error
+    wxCharBuffer buffer(length);
 
+    char *xpm_buffer = (char *)buffer.data();
     if ( stream.Read(xpm_buffer, length).LastError() == wxSTREAM_READ_ERROR )
         return wxNullImage;
     xpm_buffer[length] = '\0';
@@ -147,6 +149,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
     /*
      *  Remove comments from the file:
      */
+    char *p, *q;
     for (p = xpm_buffer; *p != '\0'; p++)
     {
         if ( (*p == '"') || (*p == '\'') )
@@ -180,7 +183,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
     /*
      *  Remove unquoted characters:
      */
-    i = 0;
+    size_t i = 0;
     for (p = xpm_buffer; *p != '\0'; p++)
     {
         if ( *p != '"' )
@@ -232,12 +235,12 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
      */
     wxImage img = ReadData(xpm_lines);
 
-    delete[] xpm_buffer;
 #ifdef __WIN16__
     delete[] (char**) xpm_lines;
 #else
     delete[] xpm_lines;
 #endif
+
     return img;
 }
 #endif // wxUSE_STREAMS