diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-05-03 00:41:21 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-04 07:09:25 +0200 |
| commit | c9f4cb2c9267fd1ad0d90b1a817e7417f1ea23ff (patch) | |
| tree | 018b0fcd424aae1789db73a9104ca9f98f14c287 | |
| parent | 9b3885248b80cbb22826bcc6e339231db11aab1f (diff) | |
QTeamCityLogger: fix .arg() placeholder injection
Since each .arg() call starts from scratch, a file name containing a
suitable %n would mess up the formatting of the following .arg() call.
Fix by using multiArg(), which requires to pre-format the line into a
QString, but which performs only a single-pass, so doesn't suffer from
the placeholder injection problem that plagues .arg()-chaining.
Pick-to: 6.3 6.2 5.15
Change-Id: I549527643da657fca0bea63d5e3becadac529d4b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
| -rw-r--r-- | src/testlib/qteamcitylogger.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 9311f24a57..b930777a6d 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -268,9 +268,8 @@ void QTeamCityLogger::addPendingMessage(const char *type, const QString &msg, co if (file) { pendMessage += "%1 |[Loc: %2(%3)|]: %4"_L1 - .arg(QString::fromUtf8(type), QString::fromUtf8(file)) - .arg(line) - .arg(msg); + .arg(QString::fromUtf8(type), QString::fromUtf8(file), + QString::number(line), msg); } else { pendMessage += "%1: %2"_L1.arg(QString::fromUtf8(type), msg); |