potok/tinyxml2
1
0
Fork 0
mirror of https://github.com/leethomason/tinyxml2.git synced 2026-07-21 19:23:00 +04:00
Code Packages Releases Wiki Activity

Merge branch 'master' of github.com:leethomason/tinyxml2

Browse Source
This commit is contained in:
Lee Thomason
2026-03-09 17:53:04 -07:00
parent 111f462dc4 aba13c50bf
commit 98137e6936
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tinyxml2.cpp
+7 -1
View File
@@ -114,6 +114,9 @@ distribution.
#define TIXML_VSNPRINTF vsnprintf #define TIXML_VSNPRINTF vsnprintf
static inline int TIXML_VSCPRINTF( const char* format, va_list va ) static inline int TIXML_VSCPRINTF( const char* format, va_list va )
{ {
if (!format) {
return 0;
}
int len = vsnprintf( 0, 0, format, va ); int len = vsnprintf( 0, 0, format, va );
TIXMLASSERT( len >= 0 ); TIXMLASSERT( len >= 0 );
return len; return len;
@@ -2344,9 +2347,12 @@ static FILE* callfopen( const char* filepath, const char* mode )
return fp; return fp;
} }
void XMLDocument::DeleteNode( XMLNode* node ) { void XMLDocument::DeleteNode( XMLNode* node ) {
TIXMLASSERT( node ); TIXMLASSERT( node );
TIXMLASSERT(node->_document == this ); TIXMLASSERT(node->_document == this );
if(node == 0) {
return; // check for null pointer
}
if (node->_parent) { if (node->_parent) {
node->_parent->DeleteChild( node ); node->_parent->DeleteChild( node );
} }
xmltest.cpp
+7 -1
View File
@@ -2025,7 +2025,13 @@ int main( int argc, const char ** argv )
XMLTest("Parse nested elements with pedantic whitespace", false, doc.Error()); XMLTest("Parse nested elements with pedantic whitespace", false, doc.Error());
XMLTest("Pedantic whitespace", true, 0 == doc.RootElement()->FirstChildElement()->GetText()); XMLTest("Pedantic whitespace", true, 0 == doc.RootElement()->FirstChildElement()->GetText());
} }
//Check the robustness of the DeleteNode function in handling null pointers.
{
XMLDocument doc;
doc.DeleteNode(nullptr);
XMLTest("DeleteNode with null pointer", true, doc.Error() == XML_SUCCESS);
}
// Check sample xml can be parsed with pedantic mode // Check sample xml can be parsed with pedantic mode
{ {
XMLDocument doc(true, PEDANTIC_WHITESPACE); XMLDocument doc(true, PEDANTIC_WHITESPACE);