whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Fix write to invalid memory 

Before deleting the children of an Aggregate, we must clear its
internal collections first. This prevents removeChild() (called
from ~Node) from accessing already deleted siblings.

Change-Id: Ic657b1d57fe4c766daa2bd4b791c3840099de709
Task-number: QTBUG-47751
Reviewed-by: Martin Smith <martin.smith@digia.com>
bb10
Topi Reinio 2015-09-24 15:11:16 +02:00 committed by Topi Reiniö
parent f7338d86af
commit 20918435b6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/qdoc/node.cpp
View File

@ -121,10 +121,12 @@ void Node::removeRelates()
if (!relatesTo_)
return;
if (relatesTo_->isDocumentNode() && !relatesTo_->parent())
if (relatesTo_->isDocumentNode() && !relatesTo_->parent()) {
delete relatesTo_;
else
relatesTo_ = 0;
} else {
relatesTo_->removeRelated(this);
}
}
/*!
@ -739,8 +741,8 @@ void Node::setLocation(const Location& t)
*/
Aggregate::~Aggregate()
{
deleteChildren();
removeFromRelated();
deleteChildren();
}
/*!
@ -1062,7 +1064,13 @@ void Aggregate::removeFromRelated()
*/
void Aggregate::deleteChildren()
{
NodeList childrenCopy = children_; // `children_` will be changed in ~Node()
NodeList childrenCopy = children_;
// Clear internal collections before deleting child nodes
children_.clear();
childMap_.clear();
enumChildren_.clear();
primaryFunctionMap_.clear();
secondaryFunctionMap_.clear();
qDeleteAll(childrenCopy);
}