From 01cae3510712e8cdb57d4f5bb6af16038a6cb1f8 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Wed, 6 Jun 2012 12:56:11 +0200 Subject: [PATCH] fix: LLXMLNode::parseStream return false and a NULL node if failing instead of a broken node and true --- indra/llxml/llxmlnode.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index e8d8581c2d..eaa4882ee1 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -820,9 +820,12 @@ bool LLXMLNode::parseStream( { llwarns << "Error parsing xml error code: " << XML_ErrorString(XML_GetErrorCode(my_parser)) - << " on lne " << XML_GetCurrentLineNumber(my_parser) + << " line: " << XML_GetCurrentLineNumber(my_parser) + << " column: " << XML_GetCurrentColumnNumber(my_parser) << llendl; - break; + delete []buffer; + node = NULL; + return false; } }