From 1c909afe3998778e4cc045c9ab733e8afbf7c25b Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 2 May 2007 21:24:47 +0000
Subject: svn merge -r 60342:61148
 svn+ssh://svn/svn/linden/branches/maintenance into release

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

(limited to 'indra/llxml/llxmlnode.cpp')

diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 0415be8206..0b0385d92f 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -291,6 +291,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.2.3