From b1ad2553ebfe7c056eafff88e9ec467712fb0c6c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Wed, 17 Apr 2013 15:32:59 +0200
Subject: [PATCH] QbsProjectManager: Fix null pointer accesses.
Change-Id: Ie57ecc36a676a3744317170eed7c4265becefe1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 6 ++++--
src/plugins/qbsprojectmanager/qbscleanstep.cpp | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 10f6294aee5..9de04c14684 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -76,8 +76,10 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildSt
QbsBuildStep::~QbsBuildStep()
{
cancel();
- m_job->deleteLater();
- m_job = 0;
+ if (m_job) {
+ m_job->deleteLater();
+ m_job = 0;
+ }
delete m_parser;
}
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 2611537ce32..042bf316db8 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -72,8 +72,10 @@ QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl, const QbsCleanSt
QbsCleanStep::~QbsCleanStep()
{
cancel();
- m_job->deleteLater();
- m_job = 0;
+ if (m_job) {
+ m_job->deleteLater();
+ m_job = 0;
+ }
}
bool QbsCleanStep::init()
--
GitLab