From 745beb76348f3589632d6cd19dc47865e404ee77 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 15 Sep 2020 14:36:26 +0200 Subject: AutoTest: Fix possible nullptr access If the process of the test executable cannot be started for whatever reason we will not have an active run configuration or output reader. Change-Id: I50146a2c8228ad39574e007ae2659465122ad20b Reviewed-by: David Schulz --- src/plugins/autotest/testrunner.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 56973b01df..b553f28f82 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -268,7 +268,7 @@ void TestRunner::cancelCurrent(TestRunner::CancelReason reason) void TestRunner::onProcessFinished() { - if (m_executingTests && QTC_GUARD(m_currentConfig)) { + if (m_executingTests && m_currentConfig) { QTC_CHECK(m_fakeFutureInterface); m_fakeFutureInterface->setProgressValue(m_fakeFutureInterface->progressValue() + m_currentConfig->testCaseCount()); @@ -286,13 +286,15 @@ void TestRunner::onProcessFinished() } } } - const int disabled = m_currentOutputReader->disabledTests(); - if (disabled > 0) - emit hadDisabledTests(disabled); - if (m_currentOutputReader->hasSummary()) - emit reportSummary(m_currentOutputReader->id(), m_currentOutputReader->summary()); + if (m_currentOutputReader) { + const int disabled = m_currentOutputReader->disabledTests(); + if (disabled > 0) + emit hadDisabledTests(disabled); + if (m_currentOutputReader->hasSummary()) + emit reportSummary(m_currentOutputReader->id(), m_currentOutputReader->summary()); - m_currentOutputReader->resetCommandlineColor(); + m_currentOutputReader->resetCommandlineColor(); + } resetInternalPointers(); if (!m_fakeFutureInterface) { -- cgit v1.2.3