fix crashes with bamf-daemon

This commit is contained in:
raveit65 2022-10-07 15:41:34 +02:00
parent f0248c33c5
commit ef180bf3bc
2 changed files with 37 additions and 2 deletions

View File

@ -3,7 +3,7 @@
Summary: Window Navigator Construction Kit
Name: libwnck3
Version: 43.0
Release: 2%{?dist}
Release: 3%{?dist}
URL: http://download.gnome.org/sources/%{source_name}/
Source0: http://download.gnome.org/sources/%{source_name}/40/%{source_name}-%{version}.tar.xz
License: LGPLv2+
@ -18,7 +18,10 @@ Patch5: libwnck_0004-icons-Mark-GdkPixbuf-icons-as-deprecated_43.patch
Patch6: libwnck_0005-tasklist-Add-surface-loader-function_43.patch
# fix https://gitlab.gnome.org/GNOME/libwnck/-/issues/154#note_1562760
# https://gitlab.gnome.org/GNOME/libwnck/-/commit/07694559cc0c65ce1cca9ac33b165cef84c34d5e
Patch: libwnck_0001-Revert-xutils-Get-the-correct-PID-for-clients-inside.patch
Patch7: libwnck_0001-Revert-xutils-Get-the-correct-PID-for-clients-inside.patch
# https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263
# https://gitlab.gnome.org/GNOME/libwnck/-/merge_requests/46
Patch8: libwnck3_handle_avoid_segfault_in_invalidate_icons.patch
BuildRequires: gcc
BuildRequires: meson
@ -82,6 +85,9 @@ developing applications that use %{name}.
%changelog
* Fri Oct 07 2022 Wolfgang Ulbrich <fedora@raveit.de> - 43.0-3
- fix https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263
* Thu Sep 29 2022 Wolfgang Ulbrich <fedora@raveit.de> - 43.0-2
- fix https://gitlab.gnome.org/GNOME/libwnck/-/issues/154

View File

@ -0,0 +1,29 @@
From 6ceb684442eb26e3bdb8a38bf52264ad55f96a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Tue, 20 Sep 2022 15:40:22 +0300
Subject: [PATCH] handle: avoid segfault in invalidate_icons
Screens variable won't be initialized if default icon sizes are
set/changed before using wnck_screen_get_default.
https://bugs.launchpad.net/ubuntu/+source/libwnck3/+bug/1990263
---
libwnck/wnck-handle.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libwnck/wnck-handle.c b/libwnck/wnck-handle.c
index e12ff882..8d5da45c 100644
--- a/libwnck/wnck-handle.c
+++ b/libwnck/wnck-handle.c
@@ -70,6 +70,9 @@ invalidate_icons (WnckHandle *self)
Display *xdisplay;
int i;
+ if (self->screens == NULL)
+ return;
+
xdisplay = _wnck_get_default_display ();
for (i = 0; i < ScreenCount (xdisplay); ++i)
--