Skip to content
This repository has been archived by the owner on Jan 2, 2023. It is now read-only.

Parse link hrefs assuming they are percent encoded #5273

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Parse link hrefs assuming they are percent encoded #5273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/lib/pdfconverter.cc
View file
Open in desktop
Expand Up @@ -566,7 +566,7 @@ void PdfConverterPrivate::findLinks(QWebFrame * frame, QVector<QPair<QWebElement
if (h.startsWith("__WKANCHOR_")) {
local.push_back( qMakePair(elm, h) );
} else {
QUrl href(h);
QUrl href = QUrl::fromEncoded(h.toLocal8Bit());
if (href.isEmpty()) continue;
href=frame->baseUrl().resolved(href);
QString key = QUrl::fromPercentEncoding(href.toString(QUrl::RemoveFragment).toLocal8Bit());
Expand All @@ -589,7 +589,7 @@ void PdfConverterPrivate::findLinks(QWebFrame * frame, QVector<QPair<QWebElement
}
}
} else if (uexternal) {
external.push_back( qMakePair(elm, settings.resolveRelativeLinks ? href.toString() : h) );
external.push_back( qMakePair(elm, settings.resolveRelativeLinks ? QString::fromLocal8Bit(href.toEncoded()) : h) );
}
}
}
Expand Down Expand Up @@ -680,7 +680,7 @@ void PdfConverterPrivate::endPage(PageObject & object, bool hasHeaderFooter, int
}
foreach (const p_t & p, external) {
QRectF r = wp.elementLocation(p.first).second;
painter->addHyperlink(r, QUrl(p.second));
painter->addHyperlink(r, QUrl::fromEncoded(p.second.toLocal8Bit()));
}
wp.spoolPage(1);
// restore margins
Expand Down Expand Up @@ -713,7 +713,7 @@ void PdfConverterPrivate::endPage(PageObject & object, bool hasHeaderFooter, int
}
foreach (const p_t & p, external) {
QRectF r = wp.elementLocation(p.first).second;
painter->addHyperlink(r, QUrl(p.second));
painter->addHyperlink(r, QUrl::fromEncoded(p.second.toLocal8Bit()));
}
wp.spoolPage(1);
// restore margins
Expand Down Expand Up @@ -871,7 +871,7 @@ void PdfConverterPrivate::spoolPage(int page) {
for (QVector< QPair<QWebElement,QString> >::iterator i=pageExternalLinks[page+1].begin();
i != pageExternalLinks[page+1].end(); ++i) {
QRectF r = webPrinter->elementLocation(i->first).second;
painter->addHyperlink(r, QUrl(i->second));
painter->addHyperlink(r, QUrl::fromEncoded(i->second.toLocal8Bit()));
}
endPage(objects[currentObject], pageHasHeaderFooter, page, pageNumber);
actualPage++;
Expand Down