util: avoid possible null pointer dereference

1 files changed, 5 insertions, 4 deletions

diff --git a/src/core/util.c b/src/core/util.c
index 193bb82a..5c78957c 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -510,15 +510,16 @@ meta_xserver_region_equal (Display       *xdisplay,
   if (region1 == region2)
     return TRUE;
 
-  if ((region1 != None && region2 == None) ||
-      (region1 == None && region2 != None))
+  if (region1 == None || region2 == None)
     return FALSE;
 
   region1_rects = XFixesFetchRegion (xdisplay, region1, &region1_nrects);
   region2_rects = XFixesFetchRegion (xdisplay, region2, &region2_nrects);
 
-  if ((region1_rects != NULL && region2_rects == NULL) ||
-      (region1_rects == NULL && region2_rects != NULL))
+  if (region1_rects == NULL && region2_rects == NULL)
+    return TRUE;
+
+  if (region1_rects == NULL || region2_rects == NULL)
     {
       if (region1_rects != NULL)
         XFree (region1_rects);