diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff new file mode 100644 index 000000000000..0c65e68f2167 --- /dev/null +++ b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff @@ -0,0 +1,33 @@ +--- a/src/webpage.cpp ++++ b/src/webpage.cpp +@@ -226,23 +226,26 @@ + doc += QL1S( "

" ); + doc += i18n( "Details of the Request:" ); + doc += QL1S( "

" ); + doc += i18n( "Description:" ); + doc += QL1S( "

" ); +- doc += description; ++ doc += Qt::escape( description ); + doc += QL1S( "

" ); + + if ( causes.count() ) { diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index 5ced048fe649..cb3a0e9eac49 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0kszffgg3zpf319lmzlmdba5gq8kdr5xwb69xwy4s2abc9nvwvbi"; }; + patches = [ ./CVE-2014-8600.diff ]; + buildInputs = [ kdelibs ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff new file mode 100644 index 000000000000..1fe26484605e --- /dev/null +++ b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff @@ -0,0 +1,19 @@ +--- a/kioslave/bookmarks/kio_bookmarks.cpp ++++ b/kioslave/bookmarks/kio_bookmarks.cpp +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include + #include +@@ -197,7 +198,7 @@ + echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); + } else { + echoHead(); +- echo("

" + i18n("Wrong request: %1",path) + "

"); ++ echo("

" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "

"); + } + finished(); + } diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 1c9706f4f4bf..2b8df4757de0 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -4,6 +4,8 @@ }: kde { + patches = [ ./CVE-2014-8600.diff ]; + buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba libcanberra pulseaudio gpgme