mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

Import upstream patch to avoid crash due to unhandled XError in

Browse Source 
XKillClient()

PR:		251136
Submitted by:	rozhuk.im@gmail.com
Obtained from:	e2fbfac304
MFH:		2020Q4
This commit is contained in:
Guido Falsi 2020-11-15 12:25:30 +00:00
parent 1d30e766c1
commit 0207d2cc2e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=555201
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
x11-wm/xfce4-wm/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.14.6
PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfwm4-${DISTVERSIONFULL}

24
x11-wm/xfce4-wm/files/patch-XKillClient-XError Normal file
View File

@ -0,0 +1,24 @@
diff --git a/src/client.c b/src/client.c
index c90c7ada710b482a847e80a1e835adf54fe97f34..13acc44f75455b1c9de70255a73cf4457dfb7531 100644
--- src/client.c
+++ src/client.c
@@ -2705,10 +2705,18 @@ clientClose (Client *c)
void
clientKill (Client *c)
{
+ ScreenInfo *screen_info;
+ DisplayInfo *display_info;
+
g_return_if_fail (c != NULL);
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
- XKillClient (clientGetXDisplay (c), c->window);
+ screen_info = c->screen_info;
+ display_info = screen_info->display_info;
+
+ myDisplayErrorTrapPush (display_info);
+ XKillClient (display_info->dpy, c->window);
+ myDisplayErrorTrapPopIgnored (display_info);
}
void