mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-12 22:40:46 -08:00
Code Issues Projects Releases Wiki Activity

Fix accessing dpyinfo after it is deallocated

Browse source 
* src/xterm.c (x_connection_closed): Print disconnect error for
the last terminal before freeing it.
This commit is contained in:
Po Lu 2022-07-04 12:56:24 +08:00
parent 3f2af38ef8
commit bd034b342c
1 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/xterm.c
View file

@ -23501,6 +23501,38 @@ For details, see etc/PROBLEMS.\n",
/* We have just closed all frames on this display. */
emacs_abort ();
/* This was the last terminal remaining, so print the error
message and associated error handlers and kill Emacs. */
if (dpyinfo->terminal == terminal_list
&& !terminal_list->next_terminal)
{
fprintf (stderr, "%s\n", error_msg);
if (!ioerror && dpyinfo)
{
/* Dump the list of error handlers for debugging
purposes. */
fprintf (stderr, "X error handlers currently installed:\n");
for (failable = dpyinfo->failable_requests;
failable < dpyinfo->next_failable_request;
++failable)
{
if (failable->end)
fprintf (stderr, "Ignoring errors between %lu to %lu\n",
failable->start, failable->end);
else
fprintf (stderr, "Ignoring errors from %lu onwards\n",
failable->start);
}
for (stack = x_error_message; stack; stack = stack->prev)
fprintf (stderr, "Trapping errors from %lu\n",
stack->first_request);
}
}
XSETTERMINAL (tmp, dpyinfo->terminal);
Fdelete_terminal (tmp, Qnoelisp);
}
@ -23508,35 +23540,7 @@ For details, see etc/PROBLEMS.\n",
unblock_input ();
if (terminal_list == 0)
{
fprintf (stderr, "%s\n", error_msg);
if (!ioerror)
{
/* Dump the list of error handlers for debugging
purposes. */
fprintf (stderr, "X error handlers currently installed:\n");
for (failable = dpyinfo->failable_requests;
failable < dpyinfo->next_failable_request;
++failable)
{
if (failable->end)
fprintf (stderr, "Ignoring errors between %lu to %lu\n",
failable->start, failable->end);
else
fprintf (stderr, "Ignoring errors from %lu onwards\n",
failable->start);
}
for (stack = x_error_message; stack; stack = stack->prev)
fprintf (stderr, "Trapping errors from %lu\n",
stack->first_request);
}
Fkill_emacs (make_fixnum (70), Qnil);
}
Fkill_emacs (make_fixnum (70), Qnil);
totally_unblock_input ();