From cd26413e82f0c4020d1702177256a1fb03103795 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 4 Sep 2024 12:47:02 +0200
Subject: [PATCH] WIP: grabs

---
 dix/grabs.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dix/grabs.c b/dix/grabs.c
index 4e63e7203..f7944b4c5 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -197,21 +197,21 @@ GrabPtr
 AllocGrab(const GrabPtr src)
 {
     GrabPtr grab = calloc(1, sizeof(GrabRec));
+    if (!grab)
+        return NULL;
 
-    if (grab) {
-        grab->xi2mask = xi2mask_new();
-        if (!grab->xi2mask) {
-            free(grab);
-            grab = NULL;
-        }
-        else if (src && !CopyGrab(grab, src)) {
-            free(grab->xi2mask);
-            free(grab);
-            grab = NULL;
-        }
-    }
+    if (!(grab->xi2mask = xi2mask_new())
+        goto err;
+
+    if (src && !CopyGrab(grab, src))
+        goto err;
 
     return grab;
+
+err:
+    free(grab->xi2mask);
+    free(grab);
+    return NULL;
 }
 
 GrabPtr