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

1 files changed, 6 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 27abaebdb83..afbc718d645 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7552,9 +7552,14 @@ static Lisp_Object
 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)