diff options
| author |   Andreas Hüttel <dilfridge@gentoo.org> | 2012-07-08 22:31:55 +0000 |
|---|---|---|
| committer | Andreas Hüttel <dilfridge@gentoo.org> | 2012-07-08 22:31:55 +0000 |
| commit | 1b9b88d85dfab3508ddb62519854f173b5705dae (patch) | |
| tree | 0190ff273dbed92badbcbc315bec5b7130d2b335 /kde-base/kdepim-common-libs/files | |
| parent | Add latest upstream patches. Fix issue where the runmythfe script called old ... (diff) | |
| download | historical-1b9b88d85dfab3508ddb62519854f173b5705dae.tar.gz historical-1b9b88d85dfab3508ddb62519854f173b5705dae.tar.bz2 historical-1b9b88d85dfab3508ddb62519854f173b5705dae.zip | |
Add fix for security bug 425388
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kdepim-common-libs/files')
| -rw-r--r-- | kde-base/kdepim-common-libs/files/kdepim-common-libs-4.8.4-sec.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.8.4-sec.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.8.4-sec.patch new file mode 100644 index 000000000000..0e1aa39a068c --- /dev/null +++ b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.8.4-sec.patch @@ -0,0 +1,29 @@ +From dbb2f72f4745e00f53031965a9c10b2d6862bd54 Mon Sep 17 00:00:00 2001 +From: Montel Laurent <montel@kde.org> +Date: Mon, 2 Jul 2012 07:00:53 +0200 +Subject: [PATCH] Security fix found by David yesterday during debug (cherry + picked from commit + b6a46407d83ad9368a9825c687fa44e660f7104a) + +--- + messageviewer/htmlquotecolorer.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/messageviewer/htmlquotecolorer.cpp b/messageviewer/htmlquotecolorer.cpp +index b54e989..67c3062 100644 +--- a/messageviewer/htmlquotecolorer.cpp ++++ b/messageviewer/htmlquotecolorer.cpp +@@ -40,6 +40,10 @@ QString HTMLQuoteColorer::process( const QString &htmlSource ) + #ifndef KDEPIM_NO_WEBKIT + // Create a DOM Document from the HTML source + QWebPage page(0); ++ page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false ); ++ page.settings()->setAttribute( QWebSettings::JavaEnabled, false ); ++ page.settings()->setAttribute( QWebSettings::PluginsEnabled, false ); ++ + QWebFrame *frame = page.mainFrame(); + frame->setHtml( htmlSource ); + +-- +1.7.9.2 + |