1
0
mirror of https://github.com/leethomason/tinyxml2.git synced 2026-07-29 15:13:01 +04:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Lee Thomason 063d313b7f fix merge 2026-03-09 18:04:02 -07:00
zhthhh aba13c50bf Fix issue #1048: Add null pointer check in XMLDocument::DeleteNode (#1057)
- Add null pointer check in XMLDocument::DeleteNode() method
- Add test case to verify null pointer handling
- Prevents segmentation fault when calling DeleteNode(nullptr)
2026-03-09 17:32:22 -07:00
sbaluja e48a1310fe Add null check for format in TIXML_VSCPRINTF (#1064) 2026-03-09 17:31:36 -07:00
2 changed files with 15 additions and 4 deletions
+8 -3
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,11 @@ 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 ); if(node == 0) {
TIXMLASSERT(node->_document == this ); return; // check for null pointer
}
TIXMLASSERT(node->_document == this);
if (node->_parent) { if (node->_parent) {
node->_parent->DeleteChild( node ); node->_parent->DeleteChild( node );
} }
+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);