From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 21 Jun 2007 22:40:22 +0000
Subject: merge -r62831:64079 branches/maintenance to release

---
 indra/llcommon/llsdserialize_xml.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/llcommon/llsdserialize_xml.cpp')

diff --git a/indra/llcommon/llsdserialize_xml.cpp b/indra/llcommon/llsdserialize_xml.cpp
index c5ab369d0f..de4f3197e6 100644
--- a/indra/llcommon/llsdserialize_xml.cpp
+++ b/indra/llcommon/llsdserialize_xml.cpp
@@ -378,7 +378,10 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 	status = XML_ParseBuffer(mParser, 0, true);
 	if (status == XML_STATUS_ERROR && !mGracefullStop)
 	{
-		((char*) buffer)[count? count - 1 : 0] = '\0';
+		if (buffer)
+		{
+			((char*) buffer)[count ? count - 1 : 0] = '\0';
+		}
 		llinfos << "LLSDXMLParser::Impl::parse: XML_STATUS_ERROR parsing:" << (char*) buffer << llendl;
 		data = LLSD();
 		return -1;
-- 
cgit v1.2.3