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

Fix abuse of QProcess::error

Browse Source 
It's invalid to call it if no previous function returned an error. Don't
rely on undefined behavior. Instead, simply check if waitForFinished()
returned false, which is what this code intended to do anyway.

Change-Id: I67903ba65e86ff1d1810481b2bd5724ab99a4b76
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Thiago Macieira
2013-12-05 23:44:33 -08:00
parent 07da6325a8
commit 817f99d3ee
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddeploystep.cpp
View File

@@ -281,8 +281,7 @@ unsigned int AndroidDeployStep::remoteModificationTime(const QString &fullDestin
QStringList arguments = AndroidDeviceInfo::adbSelector(m_deviceSerialNumber); QStringList arguments = AndroidDeviceInfo::adbSelector(m_deviceSerialNumber);
arguments << QLatin1String("ls") << destination; arguments << QLatin1String("ls") << destination;
process.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments); process.start(AndroidConfigurations::instance().adbToolPath().toString(), arguments);
process.waitForFinished(5000); if (!process.waitForFinished(5000)
if (process.error() != QProcess::UnknownError
|| process.exitCode() != 0) || process.exitCode() != 0)
return -1; return -1;
QByteArray output = process.readAll(); QByteArray output = process.readAll();