aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickmenubar.cpp
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2017-07-31 11:32:49 +0200
committerJesus Fernandez <Jesus.Fernandez@qt.io>2017-08-02 09:01:30 +0000
commit9b4b324419ea3ea097d5a855d0974c4721818012 (patch)
treefe72da17e808218bff86f4b35d4ea62eb4db4c5d /src/quicktemplates2/qquickmenubar.cpp
parenta1eaa30b0773d43de8dbb0b761ae590dc0fdcaaf (diff)
Fix dereference after null check
CID 182271 (#1 of 1): Dereference after null check (FORWARD_NULL) 5. var_deref_model: Passing null pointer item to setParentItem, which dereferences it. Coverity-Id: 182271 Change-Id: Ifd7dcf58b58271c9b5e2f461f68153aaed4b97a2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickmenubar.cpp')
-rw-r--r--src/quicktemplates2/qquickmenubar.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickmenubar.cpp b/src/quicktemplates2/qquickmenubar.cpp
index f44edbd0..de3cc9a7 100644
--- a/src/quicktemplates2/qquickmenubar.cpp
+++ b/src/quicktemplates2/qquickmenubar.cpp
@@ -100,8 +100,11 @@ QQuickItem *QQuickMenuBarPrivate::beginCreateItem()
QObject *object = delegate->beginCreate(context);
QQuickItem *item = qobject_cast<QQuickItem *>(object);
- if (!item)
+ if (!item) {
delete object;
+ delete context;
+ return nullptr;
+ }
item->setParentItem(q);
QQml_setParent_noEvent(item, q);