From a09851ff1ff49b59228d7a6f99285f0dfcb231d6 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 7 Jun 2021 09:26:57 +0200 Subject: [PATCH] ProjectExplorer: Fix Coverity warning in AbstractProcessStep *** CID 1505141: Null pointer dereferences (FORWARD_NULL) /qt-creator/src/plugins/projectexplorer/abstractprocessstep.cpp: 409 in ProjectExplorer::AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus)() 403 if (!process) // Happens when the process was canceled and handed over to the Reaper. 404 process = qobject_cast(sender()); // The process was canceled! 405 if (process) { 406 stdError(d->stderrStream->toUnicode(process->readAllStandardError())); 407 stdOutput(d->stdoutStream->toUnicode(process->readAllStandardOutput())); 408 } >>> CID 1505141: Null pointer dereferences (FORWARD_NULL) >>> Passing null pointer "process" to "cleanUp", which dereferences it. 409 d->cleanUp(process); 410 } 411 Amends 4a26a2c28. Change-Id: If9a66841b05e389a87a1b843ee5ef9e66edf15dd Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/abstractprocessstep.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 4224046fa52..e73a6352282 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -402,10 +402,9 @@ void AbstractProcessStep::slotProcessFinished(int, QProcess::ExitStatus) QtcProcess *process = d->m_process.get(); if (!process) // Happens when the process was canceled and handed over to the Reaper. process = qobject_cast(sender()); // The process was canceled! - if (process) { - stdError(d->stderrStream->toUnicode(process->readAllStandardError())); - stdOutput(d->stdoutStream->toUnicode(process->readAllStandardOutput())); - } + QTC_ASSERT(process, return); + stdError(d->stderrStream->toUnicode(process->readAllStandardError())); + stdOutput(d->stdoutStream->toUnicode(process->readAllStandardOutput())); d->cleanUp(process); }