[Emacs-diffs] master 5abadeb: (advice--called-interactively-skip): Fix inf-loop (bug#21083)

[Stefan Monnier]

branch: master
commit 5abadebc353cdb55a162a7f35a299623537cd3a8
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    (advice--called-interactively-skip): Fix inf-loop (bug#21083)
    
    * lisp/emacs-lisp/nadvice.el (advice--called-interactively-skip):
    Fix inf-loop (bug#21083).
---
 lisp/emacs-lisp/nadvice.el |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index a6db5e9..5a59a98 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -522,8 +522,9 @@ of the piece of advice."
             (while
                 (progn
                   (funcall get-next-frame)
-                  (not (and (eq (nth 1 frame2) 'apply)
-                            (eq (nth 3 frame2) inneradvice)))))
+                  (and frame2
+                       (not (and (eq (nth 1 frame2) 'apply)
+                                 (eq (nth 3 frame2) inneradvice))))))
             (funcall get-next-frame)
             (funcall get-next-frame))))
       (- i origi 1))))