From 2beaf27122ea8f07d5d53743422b26038ca3cf07 Mon Sep 17 00:00:00 2001 From: Mate Barany Date: Fri, 19 Jul 2024 14:47:15 +0200 Subject: [PATCH] Do not use non-POD global static variable in qrestaccessmanager.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace it with a static variable that is in a static function. Found by an Axivion scan. Task-number: QTBUG-125026 Pick-to: 6.7 6.5 Change-Id: I190003b2c798ceddfaf22bbf83786d8e98677721 Reviewed-by: Mårten Nordheim (cherry picked from commit f4d2f3d1d158b501f0373f13cab12243ab99b3c5) Reviewed-by: Qt Cherry-pick Bot --- src/network/access/qrestaccessmanager.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/network/access/qrestaccessmanager.cpp b/src/network/access/qrestaccessmanager.cpp index e56aee1e5d1..ec4f0976af8 100644 --- a/src/network/access/qrestaccessmanager.cpp +++ b/src/network/access/qrestaccessmanager.cpp @@ -687,7 +687,11 @@ QNetworkReply *QRestAccessManager::putWithDataImpl(const QNetworkRequest &reques return d->executeRequest([&](auto qnam) { return qnam->put(request, data); }, context, slot); } -static const auto PATCH = "PATCH"_ba; +static const QByteArray& PATCH() +{ + static auto patch = "PATCH"_ba; + return patch; +} QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &request, const QJsonDocument &data, const QObject *context, @@ -695,7 +699,7 @@ QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &requ { Q_D(QRestAccessManager); return d->executeRequest( - [](auto qnam, auto req, auto data) { return qnam->sendCustomRequest(req, PATCH, data); }, + [](auto qnam, auto req, auto data) { return qnam->sendCustomRequest(req, PATCH(), data); }, data, request, context, slot); } @@ -711,7 +715,7 @@ QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &requ QtPrivate::QSlotObjectBase *slot) { Q_D(QRestAccessManager); - return d->executeRequest([&](auto qnam) { return qnam->sendCustomRequest(request, PATCH, data); }, + return d->executeRequest([&](auto qnam) { return qnam->sendCustomRequest(request, PATCH(), data); }, context, slot); } @@ -719,7 +723,7 @@ QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &requ const QObject *context, QtPrivate::QSlotObjectBase *slot) { Q_D(QRestAccessManager); - return d->executeRequest([&](auto qnam) { return qnam->sendCustomRequest(request, PATCH, data); }, + return d->executeRequest([&](auto qnam) { return qnam->sendCustomRequest(request, PATCH(), data); }, context, slot); }