diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-05-18 16:59:05 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-20 18:43:05 +0000 |
| commit | 512dee9da76e093fa886e9106f362528850a549e (patch) | |
| tree | 6ae00e9263258de52066dfa9f46dfa1db031ac0b | |
| parent | c2c1e71926d396dcbb60000caa807c340e119036 (diff) | |
Don't call QQml_setParent_noEvent with a nullptr item
Since we check for item being nullptr just before it evidently can be,
in which case QQml_setParent_noEvent would access that nullptr.
Fixes issue raised by code checker in 23fe43ee0a0838e3b680f6dc55cd226e
Change-Id: Ic5306c0c8d89734a606ab90addc6540621696553
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit b2f4ee87d888941fd548d9a4009711d1c018073e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quicktemplates2/qquickmenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index 5c2ac891..c4b7c67d 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -299,8 +299,8 @@ QQuickItem *QQuickMenuPrivate::beginCreateItem() QQuickItem *item = qobject_cast<QQuickItem *>(object); if (!item) delete object; - - QQml_setParent_noEvent(item, q); + else + QQml_setParent_noEvent(item, q); return item; } |