From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 22 Aug 2016 06:33:48 +0000 (+0200)
Subject: Fix (next-frame nil t) crash (Bug#24281)
X-Git-Tag: emacs-25.1.90~164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=16e6207;p=emacs.git

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)
---

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;