--- OLD/xc/programs/Xserver/dix/dispatch.c	Thu Jan  1 00:00:00 1970
+++ NEW/xc/programs/Xserver/dix/dispatch.c	Thu Jan  1 00:00:00 1970
@@ -3003,8 +3003,9 @@
     }
     else if (  src->drawable.width != msk->drawable.width
 	    || src->drawable.height != msk->drawable.height
-	    || src->drawable.depth != 1
 	    || msk->drawable.depth != 1)
+	return (BadMatch);
+    if (src->drawable.depth != 1)
 	return (BadMatch);
 
     width = src->drawable.width;