From 71bd80bb93ada20ec8bc5b8230860a33bc078e49 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 12 Oct 2025 09:48:15 -0700
Subject: [PATCH] dix: handle allocation failure in ChangeWindowDeviceCursor()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported in #1817:

xwayland-24.1.6/redhat-linux-build/../dix/window.c:3495:9:
 warning[-Wanalyzer-possible-null-dereference]:
 dereference of possibly-NULL ‘pNewNode’
xwayland-24.1.6/redhat-linux-build/../dix/window.c:3494:20:
 acquire_memory: this call could return NULL

Fixes: 95e1a8805 ("Xi: Adding ChangeDeviceCursor request" in xorg 1.10.0)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2078>
(cherry picked from commit c9fa8a8da161e1c37058a342ba5495ce627d0985)
---
 dix/window.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dix/window.c b/dix/window.c
index 905cda021..866c4a5d5 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3492,6 +3492,8 @@ ChangeWindowDeviceCursor(WindowPtr pWin, DeviceIntPtr pDev, CursorPtr pCursor)
             return Success;
 
         pNewNode = malloc(sizeof(DevCursNodeRec));
+        if (!pNewNode)
+            return BadAlloc;
         pNewNode->dev = pDev;
         pNewNode->next = pWin->optional->deviceCursors;
         pWin->optional->deviceCursors = pNewNode;