Hello community,

here is the log from the commit of package kcmutils for openSUSE:Leap:15.2 
checked in at 2020-02-27 06:40:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/kcmutils (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.kcmutils.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kcmutils"

Thu Feb 27 06:40:03 2020 rev:61 rq:777699 version:5.67.0

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/kcmutils/kcmutils.changes      2020-02-16 
18:27:40.574697765 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.kcmutils.new.26092/kcmutils.changes   
2020-02-27 06:40:04.709431541 +0100
@@ -1,0 +2,6 @@
+Sun Feb 16 17:10:45 UTC 2020 - Wolfgang Bauer <[email protected]>
+
+- Add Check-activeModule-before-using-it.patch to fix crash when
+  opening Kontact's settings (kde#417396)
+
+-------------------------------------------------------------------

New:
----
  Check-activeModule-before-using-it.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kcmutils.spec ++++++
--- /var/tmp/diff_new_pack.A3Uvl8/_old  2020-02-27 06:40:05.353432883 +0100
+++ /var/tmp/diff_new_pack.A3Uvl8/_new  2020-02-27 06:40:05.357432890 +0100
@@ -36,6 +36,8 @@
 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 @@
 
 %prep
 %setup -q
+%autopatch -p1
 
 %build
   %cmake_kf5 -d build

++++++ Check-activeModule-before-using-it.patch ++++++
>From ea7120ed901bf6161bb483ab73211a6491daac8f Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <[email protected]>
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




Reply via email to