1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index eb48b41..b83555a 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -311,6 +311,12 @@ void XMLCALL StartXMLNode(void *userData,
         // Set the parent-child relationship with the current active node
         LLXMLNode* parent = (LLXMLNode *)userData;
 
+        if (NULL == parent)
+        {
+                llwarns << "parent (userData) is NULL; aborting function" << llendl;
+                return;
+        }
+
         new_node_ptr->mParser = parent->mParser;
 
         // Set the current active node to the new node