From 58f1b49f800b0bdc09268358452260b60a146ab4 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 3 Jan 2015 03:25:06 +0000
Subject: [PATCH] kioslave: CVE-2014-8600 patch (backport)

For more information:

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-8600
https://www.kde.org/info/security/advisory-20141113-1.txt
---
 kioslave/bookmarks/kio_bookmarks.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kioslave/bookmarks/kio_bookmarks.cpp b/kioslave/bookmarks/kio_bookmarks.cpp
index 750495d0..53c8aa33 100644
--- a/kioslave/bookmarks/kio_bookmarks.cpp
+++ b/kioslave/bookmarks/kio_bookmarks.cpp
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include <qregexp.h>
+#include <qtextdocument.h>
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
@@ -197,7 +198,7 @@ void BookmarksProtocol::get( const KUrl& url )
     echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
   } else {
     echoHead();
-    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
+    echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
   }
   finished();
 }