summaryrefslogtreecommitdiffstats
path: root/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff')
-rw-r--r--source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff14
1 files changed, 14 insertions, 0 deletions
diff --git a/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
new file mode 100644
index 000000000..356f30a61
--- /dev/null
+++ b/source/kde/kdelibs/kdelibs.khtml.CVE-2011-1168.diff
@@ -0,0 +1,14 @@
+--- a/khtml/khtml_part.cpp
++++ b/khtml/khtml_part.cpp
+@@ -1803,7 +1803,10 @@ void KHTMLPart::htmlError( int errorCode
+ stream >> errorName >> techName >> description >> causes >> solutions;
+
+ QString url, protocol, datetime;
+- url = Qt::escape( reqUrl.prettyUrl() );
++
++ // This is somewhat confusing, but we have to escape the externally-
++ // controlled URL twice: once for i18n, and once for HTML.
++ url = Qt::escape( Qt::escape( reqUrl.prettyUrl() ) );
+ protocol = reqUrl.protocol();
+ datetime = KGlobal::locale()->formatDateTime( QDateTime::currentDateTime(),
+ KLocale::LongDate );