AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Haloric-Issue299'

This commit is contained in:
Lee Thomason 2015-03-24 11:18:12 -07:00
parent 32cca51ac5 3ccb1cec29
commit ea21390f28
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tinyxml2.cpp
View File

@ -2297,8 +2297,11 @@ bool XMLPrinter::VisitEnter( const XMLDocument& doc )
bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute )
{ {
const XMLElement* parentElem = element.Parent()->ToElement(); const XMLElement* parentElem = NULL;
bool compactMode = parentElem ? CompactMode(*parentElem) : _compactMode; if ( element.Parent() ) {
parentElem = element.Parent()->ToElement();
}
bool compactMode = parentElem ? CompactMode(*parentElem) : _compactMode;
OpenElement( element.Name(), compactMode ); OpenElement( element.Name(), compactMode );
while ( attribute ) { while ( attribute ) {
PushAttribute( attribute->Name(), attribute->Value() ); PushAttribute( attribute->Name(), attribute->Value() );

8
xmltest.cpp
View File

@ -1425,6 +1425,14 @@ int main( int argc, const char ** argv )
XMLPrinter printer; XMLPrinter printer;
doc.Print( &printer ); doc.Print( &printer );
} }
{
// Issue 299. Can print elements that are not linked in.
// Will crash if issue not fixed.
XMLDocument doc;
XMLElement* newElement = doc.NewElement( "printme" );
XMLPrinter printer;
newElement->Accept( &printer );
}
// ----------- Performance tracking -------------- // ----------- Performance tracking --------------
{ {