diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-25 23:29:36 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 15:13:35 -0700 |
commit | 9097b9a1f29939d4996b0a685847517d02f7b5ad (patch) | |
tree | c74b091b97e2f7655593b7e011e8b37bcf1e8611 /patches/source/kdelibs/kdelibs.khtml.CVE-2011-1168.diff | |
parent | 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff) | |
download | current-13.37.tar.gz current-13.37.tar.xz |
Fri May 25 23:29:36 UTC 201813.37
patches/packages/glibc-zoneinfo-2018e-noarch-2_slack13.37.txz: Rebuilt.
Handle removal of US/Pacific-New timezone. If we see that the machine is
using this, it will be automatically switched to US/Pacific.
Diffstat (limited to 'patches/source/kdelibs/kdelibs.khtml.CVE-2011-1168.diff')
-rw-r--r-- | patches/source/kdelibs/kdelibs.khtml.CVE-2011-1168.diff | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/patches/source/kdelibs/kdelibs.khtml.CVE-2011-1168.diff b/patches/source/kdelibs/kdelibs.khtml.CVE-2011-1168.diff new file mode 100644 index 000000000..356f30a61 --- /dev/null +++ b/patches/source/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 ); |