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

AutoTest: Fix possible nullptr access

Browse Source 
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 <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2020-09-15 14:36:26 +02:00
parent 7ca297cb25
commit 745beb7634
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/autotest/testrunner.cpp
View File

@@ -268,7 +268,7 @@ void TestRunner::cancelCurrent(TestRunner::CancelReason reason)
void TestRunner::onProcessFinished() void TestRunner::onProcessFinished()
{ {
if (m_executingTests && QTC_GUARD(m_currentConfig)) { if (m_executingTests && m_currentConfig) {
QTC_CHECK(m_fakeFutureInterface); QTC_CHECK(m_fakeFutureInterface);
m_fakeFutureInterface->setProgressValue(m_fakeFutureInterface->progressValue() m_fakeFutureInterface->setProgressValue(m_fakeFutureInterface->progressValue()
+ m_currentConfig->testCaseCount()); + m_currentConfig->testCaseCount());
@@ -286,13 +286,15 @@ void TestRunner::onProcessFinished()
} }
} }
} }
const int disabled = m_currentOutputReader->disabledTests(); if (m_currentOutputReader) {
if (disabled > 0) const int disabled = m_currentOutputReader->disabledTests();
emit hadDisabledTests(disabled); if (disabled > 0)
if (m_currentOutputReader->hasSummary()) emit hadDisabledTests(disabled);
emit reportSummary(m_currentOutputReader->id(), m_currentOutputReader->summary()); if (m_currentOutputReader->hasSummary())
emit reportSummary(m_currentOutputReader->id(), m_currentOutputReader->summary());
m_currentOutputReader->resetCommandlineColor(); m_currentOutputReader->resetCommandlineColor();
}
resetInternalPointers(); resetInternalPointers();
if (!m_fakeFutureInterface) { if (!m_fakeFutureInterface) {