github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-23 06:35:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: unintended modification to normalizedBaseUrl

Browse source
This commit is contained in:
Zentino 2024-12-16 23:46:23 +08:00
commit e2cdcb2691
No known key found for this signature in database
GPG key ID: ADEEC991C0DEE42A
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/gui/rss/rsswidget.cpp
View file

@ -630,7 +630,7 @@ namespace
const QRegularExpression rx {uR"(((<a\s+[^>]*?href|<img\s+[^>]*?src)\s*=\s*["'])((https?|ftp):)?(\/\/[^\/]*)?(\/?[^\/"].*?)(["']))"_s const QRegularExpression rx {uR"(((<a\s+[^>]*?href|<img\s+[^>]*?src)\s*=\s*["'])((https?|ftp):)?(\/\/[^\/]*)?(\/?[^\/"].*?)(["']))"_s
, QRegularExpression::CaseInsensitiveOption}; , QRegularExpression::CaseInsensitiveOption};
QString normalizedBaseUrl = baseUrl.endsWith(u'/') ? baseUrl : baseUrl + u'/'; const QString normalizedBaseUrl = baseUrl.endsWith(u'/') ? baseUrl : baseUrl + u'/';
const QUrl url {normalizedBaseUrl}; const QUrl url {normalizedBaseUrl};
const QString defaultScheme = url.scheme(); const QString defaultScheme = url.scheme();
QRegularExpressionMatchIterator iter = rx.globalMatch(html); QRegularExpressionMatchIterator iter = rx.globalMatch(html);
@ -653,14 +653,14 @@ namespace
if (relativePath.startsWith(u'/')) if (relativePath.startsWith(u'/'))
relativePath = relativePath.mid(1); relativePath = relativePath.mid(1);
QString absoluteUrl;
if (!host.isEmpty()) if (!host.isEmpty())
{ absoluteUrl = defaultScheme + u":" + host;
normalizedBaseUrl = defaultScheme + u":" + host; else
} absoluteUrl = normalizedBaseUrl + relativePath;
const QString fullMatch = match.captured(0); const QString fullMatch = match.captured(0);
const QString prefix = match.captured(1); const QString prefix = match.captured(1);
const QString suffix = match.captured(7); const QString suffix = match.captured(7);
const QString absoluteUrl = normalizedBaseUrl + relativePath;
html.replace(fullMatch, (prefix + absoluteUrl + suffix)); html.replace(fullMatch, (prefix + absoluteUrl + suffix));
} }