path: root/src/core/nodes/qnode.cpp
diff options
authorPaul Lemire <>2019-10-31 14:21:05 +0100
committerPaul Lemire <>2019-11-04 19:28:27 +0000
commitb33b615f4a4ac4d61bbce320783d5cca6edd91d1 (patch)
tree42d052c6ba5bb6c2db4c53f0099288193a47a3fa /src/core/nodes/qnode.cpp
parent51b09ca0b2506f3cdfd025511a68888ed959b6d5 (diff)
QNode: stop using hash<node,connection> for bookkeeping5.13
It is totally valid to have actually the same node used for 2 distinct connections (e.g setting 2 different node properties to the same node). With the hash, the second setter call would overwrite the first connection resulting in leaving a dangling connection around potentially resulting in crashes. Instead use a QVector<pair<node, connection>> and adjust code accordingly. Change-Id: I49870c409c3f7b629c8f1bdfcb8757a904db2490 Reviewed-by: Mike Krus <> (cherry picked from commit 906f8a62f89a7ce2343a155e6db62616e66dc14b) Reviewed-by: Paul Lemire <>
Diffstat (limited to 'src/core/nodes/qnode.cpp')
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 900c3f8ce..c418e03d5 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -795,10 +795,9 @@ QNode::~QNode()
// Disconnect each connection that was stored
- for (auto it = d->m_destructionConnections.begin(), end = d->m_destructionConnections.end(); it != end; ++it)
- QObject::disconnect(it.value());
+ for (const auto &nodeConnectionPair : qAsConst(d->m_destructionConnections))
+ QObject::disconnect(nodeConnectionPair.second);
Q_EMIT nodeDestroyed();
// Notify the backend that the parent lost this node as a child and