From 00bb2425f560df08cbb91a5329f856b565f27999 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 22 Mar 2017 12:59:02 +0100 Subject: [PATCH] QmlDesigner: Really prevent possible nullptr access c16324061117b2724b2c50eb109b5ab9c13e903d added the check for !projectNode but then used the pointer anyway Change-Id: Ied63fd0991b0de1dab3d19cd57c00acd596bf752 Reviewed-by: Tobias Hunger --- src/plugins/qmldesigner/documentmanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index 59412263ac9..357420c1d87 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -436,7 +436,9 @@ bool DocumentManager::isoProFileSupportsAddingExistingFiles(const QString &resou if (!node || !node->parentFolderNode()) return false; ProjectExplorer::ProjectNode *projectNode = node->parentFolderNode()->asProjectNode(); - if (!projectNode || !projectNode->supportedActions(projectNode).contains(ProjectExplorer::AddExistingFile)) { + if (!projectNode) + return false; + if (!projectNode->supportedActions(projectNode).contains(ProjectExplorer::AddExistingFile)) { qCWarning(documentManagerLog) << "Project" << projectNode->displayName() << "does not support adding existing files"; return false; }