diff --git a/Check-activeModule-before-using-it.patch b/Check-activeModule-before-using-it.patch new file mode 100644 index 0000000..84892be --- /dev/null +++ b/Check-activeModule-before-using-it.patch @@ -0,0 +1,32 @@ +From ea7120ed901bf6161bb483ab73211a6491daac8f Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +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 + diff --git a/kcmutils.changes b/kcmutils.changes index 515d28c..cbaa93e 100644 --- a/kcmutils.changes +++ b/kcmutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 16 17:10:45 UTC 2020 - Wolfgang Bauer + +- Add Check-activeModule-before-using-it.patch to fix crash when + opening Kontact's settings (kde#417396) + ------------------------------------------------------------------- Sun Feb 2 18:06:45 UTC 2020 - Christophe Giboudeaux diff --git a/kcmutils.spec b/kcmutils.spec index af342eb..f923bf5 100644 --- a/kcmutils.spec +++ b/kcmutils.spec @@ -36,6 +36,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}- Source2: frameworks.keyring %endif Source99: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch: Check-activeModule-before-using-it.patch BuildRequires: cmake >= 3.5 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -87,6 +89,7 @@ created with the KConfigWidgets framework. Development files. %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build