Disallow windows on dead frames in decode_any_window.

* window.c (decode_any_window): Signal an error if the window is
on a dead frame.

Fixes: debbugs:11984

diff --git a/src/ChangeLog b/src/ChangeLog
index e90e48ee9dc0ca1eaaba9f6bdbd94dd8b04ac3c5..e5a0736cddcd18fa484df0cf37be4da0d6716603 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-21  Chong Yidong  <cyd@gnu.org>
+
+       * window.c (decode_any_window): Signal an error if the window is
+       on a dead frame (Bug#11984).
+
 2012-07-20  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Add indirection counting to speed up Fkill_buffer.

diff --git a/src/window.c b/src/window.c
index 3bf73134468dd03b70e2470259dcee65c85a9e9d..b7b6e283cc1780fcb106e6ec29547884db4a0e42 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -144,11 +144,15 @@ decode_window (register Lisp_Object window)
 static struct window *
 decode_any_window (register Lisp_Object window)
 {
+  struct window *w;
+
   if (NILP (window))
     return XWINDOW (selected_window);
 
   CHECK_WINDOW (window);
-  return XWINDOW (window);
+  w = XWINDOW (window);
+  CHECK_LIVE_FRAME (w->frame);
+  return w;
 }
 
 DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0,