From c07901e29ed545bbb02e3bddf148fe1104b94e9f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:56 -0500
Subject: Second Life viewer sources 1.15.1.3

---
 linden/indra/llxml/llxmlnode.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra/llxml')

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
-- 
cgit v1.1