fixed parsing of comments before root node

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

diff --git a/contrib/src/xml/xmlexpat.cpp b/contrib/src/xml/xmlexpat.cpp
index 358d45a05b09294fb4eda623824d40b719b68750..206973a4a988f946d7c00dc3631062e3288eca1c 100644 (file)
--- a/contrib/src/xml/xmlexpat.cpp
+++ b/contrib/src/xml/xmlexpat.cpp
@@ -132,8 +132,14 @@ static void CommentHnd(void *userData, const char *data)
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;   
  
 {
     wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;   
  

-    ctx->node->AddChild(new wxXmlNode(wxXML_COMMENT_NODE, 
-                                      wxT("comment"), CharToString(data)));
+    if (ctx->node)
+    {
+        // VS: ctx->node == NULL happens if there is a comment before
+        //     the root element (e.g. wxDesigner's output). We ignore such
+        //     comments, no big deal...
+        ctx->node->AddChild(new wxXmlNode(wxXML_COMMENT_NODE, 
+                            wxT("comment"), CharToString(data)));
+    }

     ctx->lastAsText = NULL;
 }
 
     ctx->lastAsText = NULL;
 }