From 958ce4f308e69eaf53c63a0f7d5ad3033f1c216d Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 22 Sep 2021 12:44:15 +0200 Subject: [PATCH] Docker: assert and return false if runInShell fails Change-Id: I0e285e84db1b5442fb4b761597d25e798ac4e94f Reviewed-by: Christian Stenger --- src/plugins/docker/dockerdevice.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index e3a97214d3b..8d5a48b155a 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -1642,10 +1642,12 @@ bool DockerDevicePrivate::runInShell(const CommandLine &cmd) const QMutexLocker l(&m_shellMutex); m_shell->readAllStandardOutput(); // clean possible left-overs m_shell->write(cmd.toUserOutput().toUtf8() + "\necho $?\n"); - m_shell->waitForReadyRead(); + QTC_ASSERT(m_shell->waitForReadyRead(), return false); QByteArray output = m_shell->readAllStandardOutput(); - int result = output.toInt(); + bool ok; + int result = output.toInt(&ok); LOG("Run command in shell:" << cmd.toUserOutput() << "result: " << output << " ==>" << result); + QTC_ASSERT(ok, return false); return result == 0; }