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

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

diff --git a/src/common/markupparser.cpp b/src/common/markupparser.cpp
index 5701ee64fa85e305a7285a0af25757dcb447f3e2..70b680bd7f9a2a6d9d688f50d91d81b6336aa558 100644 (file)
--- a/src/common/markupparser.cpp
+++ b/src/common/markupparser.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Implementation of wxMarkupParser.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16
 // Purpose:     Implementation of wxMarkupParser.
 // Author:      Vadim Zeitlin
 // Created:     2011-02-16

-// RCS-ID:      $Id: $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -25,6 +25,10 @@
 
 #if wxUSE_MARKUP
 
 
 #if wxUSE_MARKUP
 

+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+

 #include "wx/private/markupparser.h"
 
 #include "wx/stack.h"
 #include "wx/private/markupparser.h"
 
 #include "wx/stack.h"


@@ -168,7 +172,6 @@ wxMarkupParser::ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs)
             else // Must be a CSS-like size specification
             {
                 int cssSize = 1;
             else // Must be a CSS-like size specification
             {
                 int cssSize = 1;

-                wxString rest;

                 if ( value.StartsWith("xx-", &rest) )
                     cssSize = 3;
                 else if ( value.StartsWith("x-", &rest) )
                 if ( value.StartsWith("xx-", &rest) )
                     cssSize = 3;
                 else if ( value.StartsWith("x-", &rest) )


@@ -276,10 +279,15 @@ bool wxMarkupParser::Parse(const wxString& text)
                         current.clear();
                     }
 
                         current.clear();
                     }
 

+                    // This variable is used only in the debugging messages
+                    // and doesn't need to be defined if they're not compiled
+                    // at all (it actually would result in unused variable
+                    // messages in this case).
+#if wxUSE_LOG_DEBUG || !defined(HAVE_VARIADIC_MACROS)

                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();
                     // Remember the tag starting position for the error
                     // messages.
                     const size_t pos = it - text.begin();

-
+#endif

                     bool start = true;
                     if ( ++it != end && *it == '/' )
                     {
                     bool start = true;
                     if ( ++it != end && *it == '/' )
                     {