Hello community,
here is the log from the commit of package plasma-framework for
openSUSE:Factory checked in at 2020-05-16 22:23:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old)
and /work/SRC/openSUSE:Factory/.plasma-framework.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework"
Sat May 16 22:23:44 2020 rev:90 rq:805589 version:5.70.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes
2020-05-11 13:33:47.540166538 +0200
+++
/work/SRC/openSUSE:Factory/.plasma-framework.new.2738/plasma-framework.changes
2020-05-16 22:23:55.148975722 +0200
@@ -1,0 +2,6 @@
+Thu May 14 12:03:55 UTC 2020 - Wolfgang Bauer <[email protected]>
+
+- Add Avoid-potential-disconnect-of-all-signals-in-IconItem.patch
+ to fix a possible crash of plasmashell (boo#1171641, kde#421170)
+
+-------------------------------------------------------------------
New:
----
Avoid-potential-disconnect-of-all-signals-in-IconItem.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-framework.spec ++++++
--- /var/tmp/diff_new_pack.P53CNa/_old 2020-05-16 22:23:57.672980902 +0200
+++ /var/tmp/diff_new_pack.P53CNa/_new 2020-05-16 22:23:57.676980910 +0200
@@ -36,6 +36,8 @@
Source2: frameworks.keyring
%endif
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM
+Patch: Avoid-potential-disconnect-of-all-signals-in-IconItem.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -135,6 +137,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%cmake_kf5 -d build
++++++ Avoid-potential-disconnect-of-all-signals-in-IconItem.patch ++++++
>From c215c54eced5bd0b195c208dd72bb580e65f8fe4 Mon Sep 17 00:00:00 2001
From: David Edmundson <[email protected]>
Date: Thu, 14 May 2020 12:19:27 +0100
Subject: Avoid potential disconnect of all signals in IconItem
Summary:
m_svgIcon can be null.
disconnect(q, nullptr, nullptr, nullptr); would have pretty catastrophic
consequences as it disconnects everything. Anyone listening for
QObject::destroyed of IconItem for cleanup would no longer get anything.
That could lead to obscure conditions.
ShaderEffectSource watches for the source being destroyed for cleanup
and we have a newly introduced crash with ShaderEffectSource that seems
to come from this patch.
BUG: 421170
Test Plan:
Someone who could reproduce the crash reliably confirms it fixes the
issue
Reviewers: #plasma
Subscribers: kde-frameworks-devel
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D29742
---
src/declarativeimports/core/iconitem.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/declarativeimports/core/iconitem.cpp
b/src/declarativeimports/core/iconitem.cpp
index c59fd18..092a6fb 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -196,7 +196,9 @@ public:
}
~SvgSource() {
- QObject::disconnect(m_iconItem, nullptr, m_svgIcon, nullptr);
+ if (m_svgIcon) {
+ QObject::disconnect(m_iconItem, nullptr, m_svgIcon, nullptr);
+ }
}
bool isValid() const override
--
cgit v1.1
