aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-06-24 10:57:24 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-06-24 15:45:52 +0000
commit6de0287d7c3aa4251fe6eb4f970d73ce11cf07fc (patch)
tree25a10a552d3aeade6fa80d0d4f89a163e1ae8810 /src/imports
parentee6deafdb1848759d9233c37241eab4a50f2cdbf (diff)
Don't leak QQmlBoundSignalExpressions in signaltransition.cpp
We need to adopt them, not addref the newly created object. Fixes: QTBUG-83214 Pick-to: 5.15 Change-Id: Ic8660e65d4b7c7698657f6b2806b5478f7f15ea1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/statemachine/signaltransition.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 693969e8b5..c600081820 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -175,12 +175,15 @@ void SignalTransition::connectTriggered()
int signalIndex = QMetaObjectPrivate::signalIndex(metaMethod);
auto f = m_compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex];
- QQmlBoundSignalExpression *expression =
- ctxtdata ? new QQmlBoundSignalExpression(target, signalIndex, ctxtdata, this, f)
- : nullptr;
- if (expression)
+ if (ctxtdata) {
+ QQmlRefPointer<QQmlBoundSignalExpression> expression(
+ new QQmlBoundSignalExpression(target, signalIndex, ctxtdata, this, f),
+ QQmlRefPointer<QQmlBoundSignalExpression>::Adopt);
expression->setNotifyOnValueChanged(false);
- m_signalExpression = expression;
+ m_signalExpression = expression;
+ } else {
+ m_signalExpression.adopt(nullptr);
+ }
}
void SignalTransitionParser::verifyBindings(const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &props)