1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QProcess: fix startCommand() with whitespace-only strings

Browse Source 
We'd end up trying to takeFirst() from an empty QStringList.

[ChangeLog][QtCore][QProcess] Fixed a bug that would cause
startCommand() to crash if passed a string that was empty or contained
only whitespace characters.

Fixes: QTBUG-124512
Pick-to: 6.6 6.5
Change-Id: I455fe22ef4ad4b2f9b01fffd17c7689095c39272
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 60bdf2b220151021e59baa372a050b9f72400b81)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-04-18 08:12:33 -07:00 committed by Qt Cherry-pick Bot
parent bdb713b1b7
commit d24b0c05a4
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qprocess.cpp
View File

@ -2277,6 +2277,10 @@ void QProcess::start(OpenMode mode)
void QProcess::startCommand(const QString &command, OpenMode mode)
{
QStringList args = splitCommand(command);
if (args.isEmpty()) {
qWarning("QProcess::startCommand: empty or whitespace-only command was provided");
return;
}
const QString program = args.takeFirst();
start(program, args, mode);
}

20
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
View File

@ -48,6 +48,7 @@ private slots:
void constructing();
void simpleStart();
void startCommand();
void startCommandEmptyString();
void startWithOpen();
void startWithOldOpen();
void execute();
@ -299,6 +300,25 @@ void tst_QProcess::startCommand()
QCOMPARE(actual, expected);
}
void tst_QProcess::startCommandEmptyString()
{
static const char warningMsg[] =
"QProcess::startCommand: empty or whitespace-only command was provided";
QProcess process;
QTest::ignoreMessage(QtWarningMsg, warningMsg);
process.startCommand("");
QVERIFY(!process.waitForStarted());
QTest::ignoreMessage(QtWarningMsg, warningMsg);
process.startCommand(" ");
QVERIFY(!process.waitForStarted());
QTest::ignoreMessage(QtWarningMsg, warningMsg);
process.startCommand("\t\n");
QVERIFY(!process.waitForStarted());
}
void tst_QProcess::startWithOpen()
{
QProcess p;