qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQuickStackView: Avoid use-after-free 

The element can get deleted when stopping the transitions. Also, only
register the change listener if we are going to keep the item.

Pick-to: 6.2 6.3 6.4
Fixes: QTBUG-98769
Change-Id: I2fa6542fdc0dc92f3f1f0b20996cd59ce51a48cb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
This commit is contained in:
Ulf Hermann 2022-07-13 10:42:43 +02:00
parent 1d93b2234b
commit f7bac60ed8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/quicktemplates2/qquickstackelement.cpp
View File

@ -172,7 +172,6 @@ void QQuickStackElement::initialize(RequiredProperties &requiredProperties)
if (!(heightValid = p->heightValid())) if (!(heightValid = p->heightValid()))
item->setHeight(view->height()); item->setHeight(view->height());
item->setParentItem(view); item->setParentItem(view);
p->addItemChangeListener(this, QQuickItemPrivate::Destroyed);
if (!properties.isUndefined()) { if (!properties.isUndefined()) {
QQmlEngine *engine = qmlEngine(view); QQmlEngine *engine = qmlEngine(view);
@ -186,6 +185,7 @@ void QQuickStackElement::initialize(RequiredProperties &requiredProperties)
QQmlComponentPrivate::setInitialProperties(v4, qmlContext, qmlObject, ipv, requiredProperties, item); QQmlComponentPrivate::setInitialProperties(v4, qmlContext, qmlObject, ipv, requiredProperties, item);
properties.clear(); properties.clear();
} }
if (!requiredProperties.empty()) { if (!requiredProperties.empty()) {
QString error; QString error;
for (const auto &property: requiredProperties) { for (const auto &property: requiredProperties) {
@ -194,6 +194,8 @@ void QQuickStackElement::initialize(RequiredProperties &requiredProperties)
} }
QQuickStackViewPrivate::get(view)->warn(error); QQuickStackViewPrivate::get(view)->warn(error);
item = nullptr; item = nullptr;
} else {
p->addItemChangeListener(this, QQuickItemPrivate::Destroyed);
} }
init = true; init = true;

2
src/quicktemplates2/qquickstackview_p.cpp
View File

@ -252,7 +252,7 @@ void QQuickStackViewPrivate::completeTransition(QQuickStackElement *element, QQu
// the animation timer. // the animation timer.
// This allows us to correctly restore all the properties affected // This allows us to correctly restore all the properties affected
// by the push/pop animations. // by the push/pop animations.
element->completeTransition(transition); ACTION_IF_DELETED(element, element->completeTransition(transition), return);
} else if (element->item) { } else if (element->item) {
// At least try to move the item to its desired place. This, // At least try to move the item to its desired place. This,
// however, is only a partly correct solution, because a lot more // however, is only a partly correct solution, because a lot more