Make sure _XROOTPMAP_ID property is right type, format and length before
attempting to use the resulting value.
This commit is contained in:
parent
febeaf7ad1
commit
37280d7888
|
@ -1,3 +1,9 @@
|
|||
2003-11-09 Keith Packard <keithp@keithp.com>
|
||||
|
||||
* xcompmgr.c: (root_tile):
|
||||
Make sure _XROOTPMAP_ID property is right type, format and length
|
||||
before attempting to use the resulting value.
|
||||
|
||||
2003-11-09 Keith Packard <keithp@keithp.com>
|
||||
|
||||
* xcompmgr.c: (configure_win):
|
||||
|
|
|
@ -328,7 +328,8 @@ root_tile (Display *dpy)
|
|||
|
||||
if (XGetWindowProperty (dpy, root, XInternAtom (dpy, "_XROOTPMAP_ID", False),
|
||||
0, 4, False, AnyPropertyType,
|
||||
&actual_type, &actual_format, &nitems, &bytes_after, &prop) == Success)
|
||||
&actual_type, &actual_format, &nitems, &bytes_after, &prop) == Success &&
|
||||
actual_type == XInternAtom (dpy, "PIXMAP", False) && actual_format == 32 && nitems == 1)
|
||||
{
|
||||
memcpy (&pixmap, prop, 4);
|
||||
XFree (prop);
|
||||
|
|
Loading…
Reference in New Issue