From 3de679705d6329c9c04b302a60a17a0d07317ba1 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Thu, 21 Apr 2022 23:54:15 +0200
Subject: [PATCH] Don't use format string function with variable input

New gcc refuses to compile this as it may load to crashes
if the input variable contains a format string literal, e.g. %s
and there are no ... args provided to fill those in.

Being at it, removed the convertString() method as QByteArray already
provides a constData() method, so it's not needed.
---
 monitor/terminalwindow.cpp | 15 +++++----------
 monitor/terminalwindow.h   |  1 -
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/monitor/terminalwindow.cpp b/monitor/terminalwindow.cpp
index 845cc33..76a7063 100644
--- a/monitor/terminalwindow.cpp
+++ b/monitor/terminalwindow.cpp
@@ -95,11 +95,6 @@ TerminalWindow::~TerminalWindow()
     cleanup();
 }
 
-const char *TerminalWindow::convertString(const QString &string)
-{
-    return reinterpret_cast<const char *>(string.toLatin1().data());
-}
-
 QString TerminalWindow::getDurationString(uint timestamp)
 {
     uint duration = QDateTime::currentDateTimeUtc().toTime_t() - timestamp;
@@ -240,7 +235,7 @@ void TerminalWindow::paintHeader()
         headerString.append(" ");
 
     //wattron(m_headerWindow, A_BOLD | COLOR_PAIR(1));
-    mvwprintw(m_headerWindow, 1, 2, convertString(headerString));
+    mvwprintw(m_headerWindow, 1, 2, "%s", headerString.toLatin1().constData());
     //wattroff(m_headerWindow, A_BOLD | COLOR_PAIR(1));
 }
 
@@ -269,7 +264,7 @@ void TerminalWindow::paintContentClients()
                 .arg((clientMap.value("tunnelConnected").toBool() ? "T" : "-"))
                 .arg(clientMap.value("name").toString(), -30);
 
-        mvwprintw(m_contentWindow, i, 2, convertString(clientPrint.trimmed()));
+        mvwprintw(m_contentWindow, i, 2, "%s", clientPrint.trimmed().toLatin1().constData());
         i++;
     }
 }
@@ -298,7 +293,7 @@ void TerminalWindow::paintContentTunnels()
                 .arg(clientTwo.value("address").toString())
                 ;
 
-        mvwprintw(m_contentWindow, i, 2, convertString(tunnelPrint));
+        mvwprintw(m_contentWindow, i, 2, "%s", tunnelPrint.toLatin1().constData());
         i++;
     }
 }
@@ -330,7 +325,7 @@ void TerminalWindow::paintContentTunnelProxy()
             mvwaddch(m_contentWindow, i, 4, ACS_TTEE);
         }
         mvwaddch(m_contentWindow, i, 5, ACS_HLINE);
-        mvwprintw(m_contentWindow, i, 6, convertString(serverLinePrint.trimmed()));
+        mvwprintw(m_contentWindow, i, 6, "%s", serverLinePrint.trimmed().toLatin1().constData());
         i++;
 
         for (int cc = 0; cc < clientList.count(); cc++) {
@@ -352,7 +347,7 @@ void TerminalWindow::paintContentTunnelProxy()
                     .arg(humanReadableTraffic(clientMap.value("txDataCount").toInt()), - 10)
                     .arg(clientMap.value("name").toString(), -30);
 
-            mvwprintw(m_contentWindow, i, 6, convertString(clientLinePrint.trimmed()));
+            mvwprintw(m_contentWindow, i, 6, "%s", clientLinePrint.trimmed().toLatin1().constData());
 
             i++;
         }
diff --git a/monitor/terminalwindow.h b/monitor/terminalwindow.h
index 7c0b25e..87fec51 100644
--- a/monitor/terminalwindow.h
+++ b/monitor/terminalwindow.h
@@ -68,7 +68,6 @@ private:
     QVariantMap m_dataMap;
     QHash<QString, QVariantMap> m_clientHash;
 
-    const char *convertString(const QString &string);
     QString getDurationString(uint timestamp);
 
     QString humanReadableTraffic(int bytes);