diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-02-19 11:13:31 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-02-19 11:46:15 +0100 |
| commit | cfcc5d1dbf53bb25845c49a602ddf6ff4247c8a9 (patch) | |
| tree | be13e723412895f97655637c0ab73d205b804733 /kde-frameworks/kcmutils/files | |
| parent | kde-plasma: Drop KDE Plasma 5.18.0 (diff) | |
| download | gentoo-cfcc5d1dbf53bb25845c49a602ddf6ff4247c8a9.tar.gz gentoo-cfcc5d1dbf53bb25845c49a602ddf6ff4247c8a9.tar.bz2 gentoo-cfcc5d1dbf53bb25845c49a602ddf6ff4247c8a9.zip | |
kde-frameworks/kcmutils: Check activeModule before using it
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417396
Reported-by: Theofilos Intzoglou <int.teo@gmail.com>
Closes: https://bugs.gentoo.org/710078
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kcmutils/files')
| -rw-r--r-- | kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch b/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch new file mode 100644 index 000000000000..63b4b5189fab --- /dev/null +++ b/kde-frameworks/kcmutils/files/kcmutils-5.67.0-check-activeModule.patch @@ -0,0 +1,31 @@ +From ea7120ed901bf6161bb483ab73211a6491daac8f Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer <wbauer@tmo.at> +Date: Sun, 16 Feb 2020 18:05:06 +0100 +Subject: Check activeModule before using it + +`activeModule` can be a nullptr here, as this is outside/after the +`if (activeModule)`. +This causes kontact to crash when opening its settings. + +BUG: 417396 +FIXED-IN: 5.68.0 +Differential Revision: https://phabricator.kde.org/D27433 +--- + src/kcmultidialog.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp +index 90da1c0..6a36ba5 100644 +--- a/src/kcmultidialog.cpp ++++ b/src/kcmultidialog.cpp +@@ -181,7 +181,7 @@ void KCMultiDialogPrivate::_k_clientChanged() + #endif + } + +- auto buttons = activeModule->buttons(); ++ auto buttons = activeModule ? activeModule->buttons() : KCModule::NoAdditionalButton; + + QPushButton *resetButton = q->buttonBox()->button(QDialogButtonBox::Reset); + if (resetButton) { +-- +cgit v1.1 |