[Emacs-diffs] emacs-25 16e6207 3/3: Fix (next-frame nil t) crash (Bug#24281)

[Eli Zaretskii]

branch: emacs-25
commit 16e62077bb0013fdc557c4894f26164ce174064d
Author: Martin Rudalics <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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 00f25f7..cfa5f7d 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;