1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use non-POD global static variable in qrestaccessmanager.cpp

Browse Source 
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 <marten.nordheim@qt.io>
(cherry picked from commit f4d2f3d1d158b501f0373f13cab12243ab99b3c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mate Barany 2024-07-19 14:47:15 +02:00 committed by Qt Cherry-pick Bot
parent 406ddb88f8
commit 2beaf27122
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/access/qrestaccessmanager.cpp
View File

@ -687,7 +687,11 @@ QNetworkReply *QRestAccessManager::putWithDataImpl(const QNetworkRequest &reques
return d->executeRequest([&](auto qnam) { return qnam->put(request, data); }, context, slot); 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, QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &request,
const QJsonDocument &data, const QObject *context, const QJsonDocument &data, const QObject *context,
@ -695,7 +699,7 @@ QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &requ
{ {
Q_D(QRestAccessManager); Q_D(QRestAccessManager);
return d->executeRequest( 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); data, request, context, slot);
} }
@ -711,7 +715,7 @@ QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &requ
QtPrivate::QSlotObjectBase *slot) QtPrivate::QSlotObjectBase *slot)
{ {
Q_D(QRestAccessManager); 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); context, slot);
} }
@ -719,7 +723,7 @@ QNetworkReply *QRestAccessManager::patchWithDataImpl(const QNetworkRequest &requ
const QObject *context, QtPrivate::QSlotObjectBase *slot) const QObject *context, QtPrivate::QSlotObjectBase *slot)
{ {
Q_D(QRestAccessManager); 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); context, slot);
} }