From 16e62077bb0013fdc557c4894f26164ce174064d Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Mon, 22 Aug 2016 08:33:48 +0200 Subject: [PATCH] Fix (next-frame nil t) crash (Bug#24281) * src/frame.c (candidate_frame): Check minibuf argument before comparing it to zero (Bug#24281). This was backported from master (cherry picked from commit dc491c3df305a73908fe8de20b7c428a5b38c846) --- src/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frame.c b/src/frame.c index 00f25f7e911..cfa5f7d5027 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1308,7 +1308,7 @@ candidate_frame (Lisp_Object candidate, Lisp_Object frame, Lisp_Object minibuf) FRAME_FOCUS_FRAME (c))) return candidate; } - else if (XFASTINT (minibuf) == 0) + else if (INTEGERP (minibuf) && XINT (minibuf) == 0) { if (FRAME_VISIBLE_P (c) || FRAME_ICONIFIED_P (c)) return candidate; -- 2.11.4.GIT