From 2f953e817b56e8dfd3770b2109b3a81b0854f3a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Mon, 16 Jun 2008 19:55:58 +0200 Subject: [PATCH] Fix warnings about non-string-literals on printf()-like functions. qWarning() and similar functions expect a format string as first parameter. Using QString's formatting, you should not pass it as first parameter, but use the "%s" format instead. It's very difficult but it might lead to format string vulnerabilities. Signed-off-by: Manuel Nickschas --- src/common/genversion.cpp | 2 +- src/common/main.cpp | 2 +- src/core/core.cpp | 2 +- src/uisupport/old-uistyle.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/genversion.cpp b/src/common/genversion.cpp index e8e75f9f..e48d494a 100644 --- a/src/common/genversion.cpp +++ b/src/common/genversion.cpp @@ -75,7 +75,7 @@ int main(int argc, char **argv) { // ok, create our version.gen now QFile gen(target); if(!gen.open(QIODevice::WriteOnly | QIODevice::Text)) { - qFatal(QString("Could not write %1!").arg(target).toAscii()); + qFatal("%s", qPrintable(QString("Could not write %1!").arg(target))); return 255; } gen.write(QString("quasselGeneratedVersion = \"%1\";\n" diff --git a/src/common/main.cpp b/src/common/main.cpp index eca54ba2..dca70339 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -54,7 +54,7 @@ //! Signal handler for graceful shutdown. void handle_signal(int sig) { - qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii()); + qWarning("%s", qPrintable(QString("Caught signal %1 - exiting.").arg(sig))); QCoreApplication::quit(); } diff --git a/src/core/core.cpp b/src/core/core.cpp index f9f8673c..b156b2dc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -333,7 +333,7 @@ QHash Core::bufferLastSeenMsgIds(UserId user) { bool Core::startListening(uint port) { if(!server.listen(QHostAddress::Any, port)) { - qWarning(qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); + qWarning("%s", qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); return false; } qDebug() << "Listening for GUI clients on port" << server.serverPort(); diff --git a/src/uisupport/old-uistyle.cpp b/src/uisupport/old-uistyle.cpp index 83024aa4..bbbe48e6 100644 --- a/src/uisupport/old-uistyle.cpp +++ b/src/uisupport/old-uistyle.cpp @@ -199,7 +199,7 @@ UiStyle::StyledText UiStyle::styleString(const QString &_s) { if(s[pos+1] == 'D') code += s[pos+2]; FormatType ftype = formatType(code); if(ftype == Invalid) { - qWarning(qPrintable(QString("Invalid format code in string: %1").arg(s))); + qWarning("%s", qPrintable(QString("Invalid format code in string: %1").arg(s))); continue; } //Q_ASSERT(ftype != Invalid); -- 2.20.1