feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Prevent possible nullptr access

Browse Source 
Change-Id: I90f131526f97fa879cf9e6428547e6e8ed9aa936
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-05 15:29:03 +01:00
committed by Tim Jenssen
parent b31c408c87
commit c163240611
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -430,9 +430,10 @@ void DocumentManager::findPathToIsoProFile(bool *iconResourceFileAlreadyExists,
bool DocumentManager::isoProFileSupportsAddingExistingFiles(const QString &resourceFileProPath) bool DocumentManager::isoProFileSupportsAddingExistingFiles(const QString &resourceFileProPath)
{ {
ProjectExplorer::Node *node = ProjectExplorer::SessionManager::nodeForFile(Utils::FileName::fromString(resourceFileProPath)); ProjectExplorer::Node *node = ProjectExplorer::SessionManager::nodeForFile(Utils::FileName::fromString(resourceFileProPath));
ProjectExplorer::ProjectNode *projectNode = dynamic_cast<ProjectExplorer::ProjectNode*>(node->parentFolderNode()); if (!node || !node->parentFolderNode())
return false;
if (!projectNode->supportedActions(projectNode).contains(ProjectExplorer::AddExistingFile)) { ProjectExplorer::ProjectNode *projectNode = node->parentFolderNode()->asProjectNode();
if (!projectNode || !projectNode->supportedActions(projectNode).contains(ProjectExplorer::AddExistingFile)) {
qCWarning(documentManagerLog) << "Project" << projectNode->displayName() << "does not support adding existing files"; qCWarning(documentManagerLog) << "Project" << projectNode->displayName() << "does not support adding existing files";
return false; return false;
} }
@@ -443,7 +444,11 @@ bool DocumentManager::isoProFileSupportsAddingExistingFiles(const QString &resou
bool DocumentManager::addResourceFileToIsoProject(const QString &resourceFileProPath, const QString &resourceFilePath) bool DocumentManager::addResourceFileToIsoProject(const QString &resourceFileProPath, const QString &resourceFilePath)
{ {
ProjectExplorer::Node *node = ProjectExplorer::SessionManager::nodeForFile(Utils::FileName::fromString(resourceFileProPath)); ProjectExplorer::Node *node = ProjectExplorer::SessionManager::nodeForFile(Utils::FileName::fromString(resourceFileProPath));
ProjectExplorer::ProjectNode *projectNode = dynamic_cast<ProjectExplorer::ProjectNode*>(node->parentFolderNode()); if (!node || !node->parentFolderNode())
return false;
ProjectExplorer::ProjectNode *projectNode = node->parentFolderNode()->asProjectNode();
if (!projectNode)
return false;
if (!projectNode->addFiles(QStringList() << resourceFilePath)) { if (!projectNode->addFiles(QStringList() << resourceFilePath)) {
qCWarning(documentManagerLog) << "Failed to add resource file to" << projectNode->displayName(); qCWarning(documentManagerLog) << "Failed to add resource file to" << projectNode->displayName();