summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2016-08-22 08:33:48 +0200
committerMartin Rudalics <rudalics@gmx.at>2016-08-22 08:33:48 +0200
commitdc491c3df305a73908fe8de20b7c428a5b38c846 (patch)
tree739f411ea11d649f478a9490cef3a5c6ffddc344 /src
parent1a1062d6e16f97effa7030cc5f297c9c57b232ad (diff)
Fix (next-frame nil t) crash (Bug#24281)
* src/frame.c (candidate_frame): Check minibuf argument before comparing it to zero (Bug#24281).
Diffstat (limited to 'src')
-rw-r--r--src/frame.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c
index e17c8acfc3..2dbbb37289 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1310,7 +1310,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;