From 6e5d1c12ff599a1c42cf6f72fd22c2b000d67d6d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 21 Jul 2012 14:17:30 +0800 Subject: [PATCH] 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 --- src/ChangeLog | 5 +++++ src/window.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index e90e48ee9d..e5a0736cdd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-21 Chong Yidong + + * window.c (decode_any_window): Signal an error if the window is + on a dead frame (Bug#11984). + 2012-07-20 Dmitry Antipov Add indirection counting to speed up Fkill_buffer. diff --git a/src/window.c b/src/window.c index 3bf7313446..b7b6e283cc 100644 --- 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, -- 2.20.1