Mercurial > emacs
changeset 83469:5816618f2b6d
Add explicit abort() when x_catch_errors_unwind is called by mistake.
* src/xterm.c (x_catch_errors_unwind): Abort if x_error_message is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-509
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 12 Feb 2006 03:15:33 +0000 |
| parents | b98066f4aa10 |
| children | 978c1cb497a7 |
| files | src/xterm.c |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Sun Feb 12 00:15:44 2006 +0000 +++ b/src/xterm.c Sun Feb 12 03:15:33 2006 +0000 @@ -7552,9 +7552,14 @@ x_catch_errors_unwind (dummy) Lisp_Object dummy; { - Display *dpy = x_error_message->dpy; + Display *dpy; struct x_error_message_stack *tmp; + if (!x_error_message) + abort (); + + dpy = x_error_message->dpy; + /* The display may have been closed before this function is called. Check if it is still open before calling XSync. */ if (x_display_info_for_display (dpy) != 0)