Merge lp:~vanvugt/compiz/fix-1019337 into lp:compiz/0.9.8

[Daniel van Vugt]

Add extra checks to avoid passing an invalid xid to XGetWindowProperty which
would result in fatal error: BadWindow (invalid Window parameter).
(LP: #1019337)

Add extra checks to avoid passing an invalid xid to XGetWindowProperty which
would result in fatal error: BadWindow (invalid Window parameter).
(LP: #1019337)

UNBLOCK

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3280
http://jenkins.qa.ubuntu.com/job/compiz-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/1/console

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

(We aren't requring tests for gtk-window-decorator at this point)

\o/

review: Approve

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2012-06-29 03:39:30 +0000
+++ gtk/window-decorator/wnck.c	2012-07-11 04:39:18 +0000
@@ -28,7 +28,12 @@
 const gchar *
 get_frame_type (WnckWindow *win)
 {
-    WnckWindowType wnck_type = wnck_window_get_window_type (win);
+    WnckWindowType wnck_type;
+
+    if (win == NULL)
+	return "bare";
+
+    wnck_type  = wnck_window_get_window_type (win);
 
     switch (wnck_type)
     {
@@ -40,8 +45,12 @@
 	    int		  result, format;
 	    unsigned long n, left;
 	    unsigned char *data;
-
-	    result = XGetWindowProperty (gdk_x11_get_default_xdisplay (), wnck_window_get_xid (win),
+	    Window        xid = wnck_window_get_xid (win);
+
+	    if (xid == None)
+		return "bare";
+
+	    result = XGetWindowProperty (gdk_x11_get_default_xdisplay (), xid,
 					 net_wm_state_atom,
 					 0L, 1024L, FALSE, XA_ATOM, &actual, &format,
 					 &n, &left, &data);