From 9fcb876d3b7933f0b1fccfcf03b0f71a6f9b06af Mon Sep 17 00:00:00 2001 From: Dmitry-Me Date: Thu, 5 Mar 2015 17:53:34 +0300 Subject: [PATCH] Fix null pointer dereference planted in PR287 and reported in PR288 --- tinyxml2.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tinyxml2.cpp b/tinyxml2.cpp index 46f5f7f..ef00f13 100755 --- a/tinyxml2.cpp +++ b/tinyxml2.cpp @@ -520,6 +520,8 @@ char* XMLDocument::Identify( char* p, XMLNode** node ) char* const start = p; p = XMLUtil::SkipWhiteSpace( p ); if( !*p ) { + *node = 0; + TIXMLASSERT( p ); return p; } @@ -848,6 +850,9 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd ) XMLNode* node = 0; p = _document->Identify( p, &node ); + if ( node == 0 ) { + break; + } StrPair endTag; p = node->ParseDeep( p, &endTag );