Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] x11: check for null data from XGetWindowProperty

Browse Source 
This fixes a reported segfault when a window manager fails to provide
valid EWMH values.

Fixes #987
This commit is contained in:
Geoffrey McRae 2022-05-15 16:38:17 +10:00
parent 32fbcaffd2
commit 3b55ac5420
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/displayservers/X11/x11.c
View File

@ -190,14 +190,14 @@ static void x11CheckEWMHSupport(void)
if (XGetWindowProperty(x11.display, DefaultRootWindow(x11.display), if (XGetWindowProperty(x11.display, DefaultRootWindow(x11.display),
x11atoms._NET_SUPPORTING_WM_CHECK, 0, ~0L, False, XA_WINDOW, x11atoms._NET_SUPPORTING_WM_CHECK, 0, ~0L, False, XA_WINDOW,
&type, &fmt, &num, &bytes, &data) != Success) &type, &fmt, &num, &bytes, &data) != Success || !data)
goto out; goto out;
Window * windowFromRoot = (Window *)data; Window * windowFromRoot = (Window *)data;
if (XGetWindowProperty(x11.display, *windowFromRoot, if (XGetWindowProperty(x11.display, *windowFromRoot,
x11atoms._NET_SUPPORTING_WM_CHECK, 0, ~0L, False, XA_WINDOW, x11atoms._NET_SUPPORTING_WM_CHECK, 0, ~0L, False, XA_WINDOW,
&type, &fmt, &num, &bytes, &data) != Success) &type, &fmt, &num, &bytes, &data) != Success || !data)
goto out_root; goto out_root;
Window * windowFromChild = (Window *)data; Window * windowFromChild = (Window *)data;
@ -206,7 +206,7 @@ static void x11CheckEWMHSupport(void)
if (XGetWindowProperty(x11.display, DefaultRootWindow(x11.display), if (XGetWindowProperty(x11.display, DefaultRootWindow(x11.display),
x11atoms._NET_SUPPORTED, 0, ~0L, False, AnyPropertyType, x11atoms._NET_SUPPORTED, 0, ~0L, False, AnyPropertyType,
&type, &fmt, &num, &bytes, &data) != Success) &type, &fmt, &num, &bytes, &data) != Success || !data)
goto out_child; goto out_child;
Atom * supported = (Atom *)data; Atom * supported = (Atom *)data;
@ -214,7 +214,7 @@ static void x11CheckEWMHSupport(void)
if (XGetWindowProperty(x11.display, *windowFromRoot, if (XGetWindowProperty(x11.display, *windowFromRoot,
x11atoms._NET_WM_NAME, 0, ~0L, False, AnyPropertyType, x11atoms._NET_WM_NAME, 0, ~0L, False, AnyPropertyType,
&type, &fmt, &num, &bytes, &data) != Success) &type, &fmt, &num, &bytes, &data) != Success || !data)
goto out_supported; goto out_supported;
char * wmName = (char *)data; char * wmName = (char *)data;