feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Aggregation: Fix crash when components are in parent-child relationship

Browse Source 
and the child is deleted first.

Change-Id: Idea3b4a3410bda99a8727551e2cbeab3a7b95d85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Eike Ziller
2023-11-28 10:40:52 +01:00
parent 40d5a90bbc
commit 12428bf1d6
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/aggregation/aggregate.cpp
View File

@@ -193,6 +193,9 @@ void Aggregate::deleteSelf(QObject *obj)
QWriteLocker locker(&lock());
aggregateMap().remove(obj);
m_components.removeAll(obj);
// Avoid issues if obj was child of another component of the aggregate.
// The parent is deleted in ~Aggregate and might still have a reference on obj
obj->setParent({});
}
delete this;
}

18
tests/auto/aggregation/tst_aggregate.cpp
View File

@@ -78,6 +78,24 @@ void tst_Aggregate::deleteAggregation()
component1 = new Interface1;
delete component1;
QVERIFY(component1 == 0);
// do not crash if components are in a child/parent relationship
// parent deleted first
aggregation = new Aggregation::Aggregate;
component1 = new Interface1;
component2 = new Interface2;
component2->setParent(component1);
aggregation->add(component1);
aggregation->add(component2);
delete component1;
// child deleted first
aggregation = new Aggregation::Aggregate;
component1 = new Interface1;
component2 = new Interface2;
component2->setParent(component1);
aggregation->add(component1);
aggregation->add(component2);
delete component2;
}
void tst_Aggregate::queryAggregation()