[Emacs-diffs] /srv/bzr/emacs/trunk r109173: Disallow windows on dead frames in decode_any_window.

[Chong Yidong]

------------------------------------------------------------
revno: 109173
fixes bug: http://debbugs.gnu.org/11984
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-21 14:17:30 +0800
message:
  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.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-21 06:13:23 +0000
+++ b/src/ChangeLog     2012-07-21 06:17:30 +0000
@@ -1,3 +1,8 @@
+2012-07-21  Chong Yidong  <address@hidden>
+
+       * window.c (decode_any_window): Signal an error if the window is
+       on a dead frame (Bug#11984).
+
 2012-07-20  Dmitry Antipov  <address@hidden>
 
        Add indirection counting to speed up Fkill_buffer.

=== modified file 'src/window.c'
--- a/src/window.c      2012-07-21 06:13:23 +0000
+++ b/src/window.c      2012-07-21 06:17:30 +0000
@@ -144,11 +144,15 @@
 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,