Mercurial > emacs

changeset 83281:b00208784797

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent core dump when connection is lost during frame creation. * src/xfns.c (unwind_create_frame): Don't do anything if the frame is already dead. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-321
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 27 Mar 2005 19:22:10 +0000
parents 0a18b9f190e2
children 6f9586cdd29c
files src/xfns.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfns.c	Sun Mar 27 18:53:41 2005 +0000
+++ b/src/xfns.c	Sun Mar 27 19:22:10 2005 +0000
@@ -2952,6 +2952,12 @@
 {
   struct frame *f = XFRAME (frame);
 
+  /* If frame is already dead, nothing to do.  This can happen if the
+     display is disconnected after the frame has become official, but
+     before x_create_frame removes the unwind protect.  */
+  if (!FRAME_LIVE_P (f))
+    return Qnil;
+
   /* If frame is ``official'', nothing to do.  */
   if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
     {