From fde685eefe83f8e4f03e6136838437a8f7378934 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 29 Mar 2026 16:00:55 -0700
Subject: [PATCH] os: handle memory allocation failure in
 set_font_authorizations()
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/../os/utils.c:1108:9:
 warning[-Wanalyzer-possible-null-dereference]:
  dereference of possibly-NULL ‘result’
xwayland-24.1.6/redhat-linux-build/../os/utils.c:1108:9:
 danger: ‘malloc((long unsigned int)len + 18)’ could be NULL:
  unchecked value from (3)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 os/utils.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/os/utils.c b/os/utils.c
index cca1e8491..ca18f0765 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1115,6 +1115,14 @@ set_font_authorizations(char **authorizations, int *authlen, void *client)
 
         len = strlen(hnameptr) + 1;
         result = malloc(len + sizeof(AUTHORIZATION_NAME) + 4);
+        if (result == NULL) {
+#if defined(HAVE_GETADDRINFO)
+            if (ai) {
+                freeaddrinfo(ai);
+            }
+#endif
+            return 0;
+        }
 
         p = result;
         *p++ = sizeof(AUTHORIZATION_NAME) >> 8;