diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-20 12:18:40 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-20 12:18:40 -0400 |
commit | 6776f9f1891d80592d867b82b63863a31c174982 (patch) | |
tree | 6761046417abad21850e6cd85e79b21ec117bbf5 /libre/kdelibs-libre/CVE-2014-3494.patch | |
parent | 76ed0ac12ddb7709072e79aa2ce4c6058a17e2b8 (diff) | |
parent | 9cbd09c3ed3e4eae8919c0bc1d7b79e93d296f72 (diff) | |
download | abslibre-6776f9f1891d80592d867b82b63863a31c174982.tar.gz abslibre-6776f9f1891d80592d867b82b63863a31c174982.tar.bz2 abslibre-6776f9f1891d80592d867b82b63863a31c174982.zip |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre/kdelibs-libre/CVE-2014-3494.patch')
-rw-r--r-- | libre/kdelibs-libre/CVE-2014-3494.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/libre/kdelibs-libre/CVE-2014-3494.patch b/libre/kdelibs-libre/CVE-2014-3494.patch new file mode 100644 index 000000000..648d4fd7d --- /dev/null +++ b/libre/kdelibs-libre/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 { + |