Fix crash where dead frame remains on list of live frames (Bug#80120)

* src/fns.c (delq_no_quit): New function.
* src/lisp.h: Extern delq_no_quit.
* src/frame.c (delete_frame): Call delq_no_quit to remove frame
from Vframe_list uninterruptedly (Bug#80120).

3 files changed, 27 insertions, 3 deletions

diff --git a/src/fns.c b/src/fns.c
index 3604e633f8d..5c30d950cff 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2104,6 +2104,31 @@ argument.  */)
   return list;
 }
 
+/* Like Fdelq but do not report errors and neither quit nor process
+   signals.  Use only on objects known to be non-circular lists.  */
+Lisp_Object
+delq_no_quit (Lisp_Object elt, Lisp_Object list)
+{
+  Lisp_Object prev = Qnil, tail = list;
+
+  for (; !NILP (tail); tail = XCDR (tail))
+    {
+      Lisp_Object tem = XCAR (tail);
+
+      if (EQ (elt, tem))
+        {
+          if (NILP (prev))
+            list = XCDR (tail);
+          else
+            Fsetcdr (prev, XCDR (tail));
+        }
+      else
+        prev = tail;
+    }
+
+  return list;
+}
+
 DEFUN ("delete", Fdelete, Sdelete, 2, 2, 0,
        doc: /* Delete members of SEQ which are `equal' to ELT, and return the result.
 SEQ must be a sequence (i.e. a list, a vector, or a string).
diff --git a/src/frame.c b/src/frame.c
index a03be0cd52f..5d38f015130 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2778,9 +2778,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
   delete_all_child_windows (f->root_window);
   fset_root_window (f, Qnil);
 
-  block_input ();
-  Vframe_list = Fdelq (frame, Vframe_list);
-  unblock_input ();
+  Vframe_list = delq_no_quit (frame, Vframe_list);
   SET_FRAME_VISIBLE (f, false);
 
   /* Allow the vector of menu bar contents to be freed in the next
diff --git a/src/lisp.h b/src/lisp.h
index 49f7c1c9782..68d1226b2ee 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4284,6 +4284,7 @@ extern Lisp_Object nconc2 (Lisp_Object, Lisp_Object);
 extern Lisp_Object assq_no_quit (Lisp_Object, Lisp_Object);
 extern Lisp_Object assq_no_signal (Lisp_Object, Lisp_Object);
 extern Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object);
+extern Lisp_Object delq_no_quit (Lisp_Object, Lisp_Object);
 extern ptrdiff_t string_char_to_byte (Lisp_Object, ptrdiff_t);
 extern ptrdiff_t string_byte_to_char (Lisp_Object, ptrdiff_t);
 extern Lisp_Object string_to_multibyte (Lisp_Object);