diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2016-08-22 08:33:48 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-09-23 17:05:29 +0300 |
| commit | 16e62077bb0013fdc557c4894f26164ce174064d (patch) | |
| tree | 48caecc28f8d2ee4ddded47bbd6163fd8cd41446 /src | |
| parent | 3f539c0013cf0f64b71e58d288ff1e53211fba2d (diff) | |
| download | emacs-16e62077bb0013fdc557c4894f26164ce174064d.tar.gz | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |