From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Jan 2025 06:25:48 +0000 (-0800)
Subject: Don’t silently truncate connection-lost diagnostic
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7e2dfdf43d11479b9ac40d46e669c6ce95a9359;p=emacs.git

Don’t silently truncate connection-lost diagnostic

* src/xterm.c (x_io_error_quitter): Do not silently truncate
the diagnostic when a connection is lost to an X server.

(cherry picked from commit 2efffbe7731ba979540df851819af0ef15b94c62)
---

diff --git a/src/xterm.c b/src/xterm.c
index b16f4ddfccf..21968b38e78 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -27123,11 +27123,13 @@ x_error_quitter (Display *display, XErrorEvent *event)
 static int NO_INLINE
 x_io_error_quitter (Display *display)
 {
-  char buf[256];
-
-  snprintf (buf, sizeof buf, "Connection lost to X server '%s'",
-	    DisplayString (display));
+  char const *server = DisplayString (display);
+  static char const fmt[] = "Connection lost to X server '%s'";
+  USE_SAFE_ALLOCA;
+  char *buf = SAFE_ALLOCA (sizeof fmt - sizeof "%s" + strlen (server) + 1);
+  sprintf (buf, fmt, server);
   x_connection_closed (display, buf, true);
+  SAFE_FREE ();
 
   return 0;
 }