From 406ddb88f8daae82192606ff429f525897ee4923 Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Fri, 19 Jul 2024 14:28:22 +0200 Subject: [PATCH] Do not use global static non-POD variable for backend name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace it with a static variable that is inside a static function. Found by an Axivion scan. Task-number: QTBUG-125026 Pick-to: 6.7 6.5 Change-Id: Ic85b683fddb18a389f1d461e4f7ab6b08bf8c3ec Reviewed-by: Mårten Nordheim (cherry picked from commit 51dbdb6f9bf41fa2d7a30c598e9bdc61eaece281) Reviewed-by: Qt Cherry-pick Bot --- .../glib/qglibnetworkinformationbackend.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp b/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp index 0b45eb9ce31..17654842246 100644 --- a/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp +++ b/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp @@ -31,7 +31,11 @@ QNetworkInformation::Reachability reachabilityFromGNetworkConnectivity(GNetworkC } } -static QString backendName = QStringLiteral("glib"); +static const QString &backendName() +{ + static auto name = u"glib"_s; + return name; +} class QGlibNetworkInformationBackend : public QNetworkInformationBackend { @@ -40,7 +44,7 @@ public: QGlibNetworkInformationBackend(); ~QGlibNetworkInformationBackend(); - QString name() const override { return backendName; } + QString name() const override { return backendName(); } QNetworkInformation::Features featuresSupported() const override { if (!isValid()) @@ -76,7 +80,7 @@ class QGlibNetworkInformationBackendFactory : public QNetworkInformationBackendF public: QGlibNetworkInformationBackendFactory() = default; ~QGlibNetworkInformationBackendFactory() = default; - QString name() const override { return backendName; } + QString name() const override { return backendName(); } QNetworkInformation::Features featuresSupported() const override { return QGlibNetworkInformationBackend::featuresSupportedStatic();