From 4374000a501722379d6ca2df10b5a64e58192cff Mon Sep 17 00:00:00 2001
From: YaoBing Xiao <xiaoyaobing@uniontech.com>
Date: Fri, 11 Oct 2024 09:35:18 +0800
Subject: [PATCH] xwayland: prevent potential null pointer dereference

Signed-off-by: YaoBing Xiao <xiaoyaobing@uniontech.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1718>
(cherry picked from commit e12d9863fd46698f8904976db7364b62c99daf36)
---
 hw/xwayland/xwayland-xtest.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index 1fec79e53..3890df303 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -358,11 +358,12 @@ setup_ei(ClientPtr client)
     }
 
     xwl_ei_client = calloc(1, sizeof *xwl_ei_client);
-    xwl_ei_client->cmdline = Xstrdup(cmdname);
     if (!xwl_ei_client) {
         error_ei("OOM, cannot setup EI\n");
         goto out;
     }
+
+    xwl_ei_client->cmdline = Xstrdup(cmdname);
     xorg_list_init(&xwl_ei_client->link);
 
     ei = ei_new(NULL);