Bug #1360: Fix a segfault by checking the return value of XQueryTree.

    (Johan Kiviniemi)

diff --git a/ChangeLog b/ChangeLog
index f9abcd0a43b554e5dd441e7a4dd3069fde6945c5..467e608dea4f98c433206ff35efd98d5398a3b2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-14  Adam Jackson  <ajax@freedesktop.org>
+
+       * xcompmgr.c:
+       Bug #1360: Fix a segfault by checking the return value of XQueryTree.
+       (Johan Kiviniemi)
+
 2004-09-10  Adam Jackson  <ajax@freedesktop.org>
 
        * xcompmgr.c:

diff --git a/xcompmgr.c b/xcompmgr.c
index 122d8b495f5216a49c106d0f8b7c388be0214df5..7e542fea1f00edbc6e603e514eb0ed8aa74ec07e 100644 (file)
--- a/xcompmgr.c
+++ b/xcompmgr.c
@@ -1297,7 +1297,13 @@ determine_wintype (Display *dpy, Window w)
     if (type != winNormalAtom)
        return type;
 
-    XQueryTree (dpy, w, &root_return, &parent_return, &children, &nchildren);
+    if (!XQueryTree (dpy, w, &root_return, &parent_return, &children,
+                           &nchildren))
+    {
+       /* XQueryTree failed. */
+       return winNormalAtom;
+    }
+
     for (i = 0;i < nchildren;i++)
     {
        type = determine_wintype (dpy, children[i]);