diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2014-06-18 22:18:28 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2014-06-18 22:18:28 +0000 |
| commit | bc92ae99428d484182e9fa378a6e9c6459d19b3d (patch) | |
| tree | 610250b48557e05f0a04029b9ac432e3eb11b15e /kde-base/kdelibs/files | |
| parent | Remove p.masks of old (removed) media-video/libav versions. (diff) | |
| download | historical-bc92ae99428d484182e9fa378a6e9c6459d19b3d.tar.gz historical-bc92ae99428d484182e9fa378a6e9c6459d19b3d.tar.bz2 historical-bc92ae99428d484182e9fa378a6e9c6459d19b3d.zip | |
Bug 513726, CVE-2014-3494
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB
Diffstat (limited to 'kde-base/kdelibs/files')
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch b/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch new file mode 100644 index 000000000000..648d4fd7d4b8 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-4.13.2-CVE-2014-3494.patch @@ -0,0 +1,55 @@ +From: David Faure <faure@kde.org> +Date: Wed, 18 Jun 2014 18:29:04 +0000 +Subject: Don't require a job to handle messageboxes. +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d +--- +Don't require a job to handle messageboxes. + +The POP3 ioslave doesn't have a job when it gets here. +--- + + +--- a/kio/kio/usernotificationhandler.cpp ++++ b/kio/kio/usernotificationhandler.cpp +@@ -19,7 +19,7 @@ + #include "usernotificationhandler_p.h" + + #include "slave.h" +-#include "job_p.h" ++#include "jobuidelegate.h" + + #include <kdebug.h> + +@@ -76,19 +76,18 @@ + + if (m_cachedResults.contains(key)) { + result = *(m_cachedResults[key]); +- } else if (r->slave->job()) { +- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); +- if (jobPrivate) { +- result = jobPrivate->requestMessageBox(r->type, +- r->data.value(MSG_TEXT).toString(), +- r->data.value(MSG_CAPTION).toString(), +- r->data.value(MSG_YES_BUTTON_TEXT).toString(), +- r->data.value(MSG_NO_BUTTON_TEXT).toString(), +- r->data.value(MSG_YES_BUTTON_ICON).toString(), +- r->data.value(MSG_NO_BUTTON_ICON).toString(), +- r->data.value(MSG_DONT_ASK_AGAIN).toString(), +- r->data.value(MSG_META_DATA).toMap()); +- } ++ } else { ++ JobUiDelegate ui; ++ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type); ++ result = ui.requestMessageBox(type, ++ r->data.value(MSG_TEXT).toString(), ++ r->data.value(MSG_CAPTION).toString(), ++ r->data.value(MSG_YES_BUTTON_TEXT).toString(), ++ r->data.value(MSG_NO_BUTTON_TEXT).toString(), ++ r->data.value(MSG_YES_BUTTON_ICON).toString(), ++ r->data.value(MSG_NO_BUTTON_ICON).toString(), ++ r->data.value(MSG_DONT_ASK_AGAIN).toString(), ++ r->data.value(MSG_META_DATA).toMap()); + m_cachedResults.insert(key, new int(result)); + } + } else { + |