diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /kde-frameworks/kcmutils/files | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
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 |