bug#44794: 28.0.50; Frame creation broken with (tool-bar-mode -1)

[Stefan Kangas <stefan@marxist.se>]

[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]

David Fussner via "Bug reports for GNU Emacs, the Swiss army knife of
text editors" <bug-gnu-emacs@gnu.org> writes:

> With a .emacs file containing only the line:
>
> (tool-bar-mode -1)
>
> Then ./emacs in the repo src directory.
>
> On my system, the initial frame is blank except for a title bar, menu
> bar and a scroll bar -- no mini-buffer and nothing at all in the main
> window. If you resize the frame with the mouse or by keyboard shortcut
> then the usual splash screen appears, along with the mini-buffer. The
> symptoms differ somewhat if you add font specifications and/or frame
> size specifications to the .emacs file, but it still doesn't work
> right.
>
> I bisected it to commit 36431e1679, which modifies xterm.c. Reverting
> that commit and rebuilding brings back the previous behavior, and all
> looks correct to me.

Thank you for bisecting and the clear recipe.  This points at a recent
and fairly trivial patch by me, but I unfortunately can't reproduce the
issue here.

There is something subtle going on here that I don't understand.  Does
anyone else have an idea?

This might be a long-shot, but could you please try the attached patch
to see if it works better?  It's the best I could come up with; if it
doesn't work, I think someone else will have to help figure this one
out.

[-- Attachment #2: bug-44794-sk.patch --]
[-- Type: text/x-diff, Size: 1257 bytes --]

diff --git a/src/xterm.c b/src/xterm.c
index 0d2452de92..05353a2ec2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12927,24 +12927,19 @@ #define NUM_ARGV 10
   XSetAfterFunction (x_current_display, x_trace_wire);
 #endif
 
-  Lisp_Object system_name = Fsystem_name ();
   static char const title[] = "GNU Emacs";
+  static char const at[] = " at ";
+  Lisp_Object system_name = Fsystem_name ();
+  ptrdiff_t nbytes = sizeof (title) + sizeof (at);
+  if (STRINGP (system_name)
+      && INT_ADD_WRAPV (nbytes, SBYTES (system_name) + 1, &nbytes))
+    memory_full (SIZE_MAX);
+  dpyinfo->x_id = ++x_display_id;
+  dpyinfo->x_id_name = xmalloc (nbytes);
   if (STRINGP (system_name))
-    {
-      static char const at[] = " at ";
-      ptrdiff_t nbytes = sizeof (title) + sizeof (at);
-      if (INT_ADD_WRAPV (nbytes, SBYTES (system_name), &nbytes))
-	memory_full (SIZE_MAX);
-      dpyinfo->x_id_name = xmalloc (nbytes);
       sprintf (dpyinfo->x_id_name, "%s%s%s", title, at, SDATA (system_name));
-    }
   else
-    {
-      dpyinfo->x_id_name = xmalloc (sizeof (title));
       strcpy (dpyinfo->x_id_name, title);
-    }
-
-  dpyinfo->x_id = ++x_display_id;
 
   /* Figure out which modifier bits mean what.  */
   x_find_modifier_meanings (dpyinfo);