mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 07:11:34 -08:00
Code Issues Projects Releases Wiki Activity

lisp/progmodes/python.el (python-nav-end-of-block): prevent infinite loop

Browse source 
lisp/progmodes/python.el (python-nav-end-of-block): Fix a bad
assumption that python-nav-end-of-statement always makes forward
progress by testing that it actually does. If this check is not made
then it is possible for python-nav-end-of-block to enter an infinite
loop. (bug#56271)
This commit is contained in:
Tom Gillespie 2022-06-28 19:28:05 -07:00 • committed by Lars Ingebrigtsen
parent e73dbcf26d
commit bf1dbdd87b
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/progmodes/python.el
View file

@ -1636,11 +1636,15 @@ of the statement."
(while (and (or noend (goto-char (line-end-position)))
(not (eobp))
(cond ((setq string-start (python-syntax-context 'string))
;; The assertion can only fail if syntax table
;; The condition can be nil if syntax table
;; text properties and the `syntax-ppss' cache
;; are somehow out of whack. This has been
;; observed when using `syntax-ppss' during
;; narrowing.
;; It can also fail in cases where the buffer is in
;; the process of being modified, e.g. when creating
;; a string with `electric-pair-mode' disabled such
;; that there can be an unmatched single quote
(when (>= string-start last-string-end)
(goto-char string-start)
(if (python-syntax-context 'paren)
@ -1723,7 +1727,10 @@ backward to previous statement."
(while (and (forward-line 1)
(not (eobp))
(or (and (> (current-indentation) block-indentation)
(or (python-nav-end-of-statement) t))
(let ((start (point)))
(python-nav-end-of-statement)
;; must move forward otherwise infinite loop
(> (point) start)))
(python-info-current-line-comment-p)
(python-info-current-line-empty-p))))
(python-util-forward-comment -1)