mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix performance regression

Browse source 
Follow up #19417.
PR #19652.
This commit is contained in:
Chocobo1 2023-09-28 01:26:57 +08:00 committed by GitHub
parent 46c1c9de65
commit 529e49aea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/base/http/requestparser.cpp
View file

@ -208,7 +208,7 @@ bool RequestParser::parseRequestLine(const QString &line)
const int sepPos = url.indexOf('?');
const QByteArrayView pathComponent = ((sepPos == -1) ? url : QByteArrayView(url).mid(0, sepPos));
m_request.path = QString::fromUtf8(QByteArray::fromPercentEncoding(pathComponent.toByteArray()));
m_request.path = QString::fromUtf8(QByteArray::fromPercentEncoding(asQByteArray(pathComponent)));
if (sepPos >= 0)
{
@ -223,10 +223,11 @@ bool RequestParser::parseRequestLine(const QString &line)
const QByteArrayView nameComponent = param.mid(0, eqCharPos);
const QByteArrayView valueComponent = param.mid(eqCharPos + 1);
const QString paramName = QString::fromUtf8(QByteArray::fromPercentEncoding(nameComponent.toByteArray()).replace('+', ' '));
const QString paramName = QString::fromUtf8(
QByteArray::fromPercentEncoding(asQByteArray(nameComponent)).replace('+', ' '));
const QByteArray paramValue = valueComponent.isNull()
? QByteArray("")
: QByteArray::fromPercentEncoding(valueComponent.toByteArray()).replace('+', ' ');
: QByteArray::fromPercentEncoding(asQByteArray(valueComponent)).replace('+', ' ');
m_request.query[paramName] = paramValue;
}

7
src/base/utils/bytearray.cpp
View file

@ -60,6 +60,13 @@ QList<QByteArrayView> Utils::ByteArray::splitToViews(const QByteArrayView in, co
return ret;
}
QByteArray Utils::ByteArray::asQByteArray(const QByteArrayView view)
{
// `QByteArrayView::toByteArray()` will deep copy the data
// So we provide our own fast path for appropriate situations/code
return QByteArray::fromRawData(view.constData(), view.size());
}
QByteArray Utils::ByteArray::toBase32(const QByteArray &in)
{
const char alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";

1
src/base/utils/bytearray.h
View file

@ -39,6 +39,7 @@ namespace Utils::ByteArray
{
// Mimic QStringView(in).split(sep, behavior)
QList<QByteArrayView> splitToViews(QByteArrayView in, QByteArrayView sep, Qt::SplitBehavior behavior = Qt::KeepEmptyParts);
QByteArray asQByteArray(QByteArrayView view);
QByteArray toBase32(const QByteArray &in);
}

4
src/base/utils/password.cpp
View file

@ -103,8 +103,8 @@ bool Utils::Password::PBKDF2::verify(const QByteArray &secret, const QByteArray
if (list.size() != 2)
return false;
const QByteArray salt = QByteArray::fromBase64(list[0].toByteArray());
const QByteArray key = QByteArray::fromBase64(list[1].toByteArray());
const QByteArray salt = QByteArray::fromBase64(Utils::ByteArray::asQByteArray(list[0]));
const QByteArray key = QByteArray::fromBase64(Utils::ByteArray::asQByteArray(list[1]));
std::array<unsigned char, 64> outBuf {};
const int hmacResult = PKCS5_PBKDF2_HMAC(password.constData(), password.size()