Skip to content

Fix xmlDestroyNode not removing nodes from saved XML files #5002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QueryOfficial wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

Fix xmlDestroyNode not removing nodes from saved XML files #5002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Shared/XML/CXMLNodeImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,20 @@ CXMLNodeImpl::~CXMLNodeImpl()
if (m_bUsingIDs)
CXMLArray::PushUniqueID(this);

// Delete our children
// Delete wrapper children first so each child unlinks its own tinyxml2 node
// before this node is removed from the document.
DeleteAllSubNodes();

// Keep the underlying document in sync when nodes are destroyed via
// xmlDestroyNode. DeleteWrapper nulls m_pNode before delete to avoid
// unlinking during full file teardown.
if (m_pNode)
{
if (XMLNode* pXmlParent = m_pNode->Parent())
pXmlParent->DeleteChild(m_pNode);
m_pNode = nullptr;
}

// We need a parent to delete the node
if (m_pParent)
{
Expand Down