mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Avoid a regexp overflow in message-goto-body

Browse source 
* lisp/gnus/message.el (message-goto-body-1): Avoid using a
complicated backtracking regexp, because they may overflow on
large headers (bug#21160).
This commit is contained in:
Lars Ingebrigtsen 2017-01-26 21:12:05 +01:00
parent b720f1a336
commit 301ee3d031
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/gnus/message.el
View file

@ -3111,16 +3111,26 @@ M-RET `message-newline-and-reformat' (break the line and reformat)."
(message-goto-body-1))
(defun message-goto-body-1 ()
"Go to the body and return point."
(goto-char (point-min))
(or (search-forward (concat "\n" mail-header-separator "\n") nil t)
(search-forward-regexp "[^:]+:\\([^\n]\\|\n[ \t]\\)+\n\n" nil t)))
;; If the message is mangled, find the end of the headers the
;; hard way.
(progn
;; Skip past all headers and continuation lines.
(while (looking-at "[^:]+:\\|[\t ]+[^\t ]")
(forward-line 1))
;; We're now at the first empty line, so perhaps move past it.
(when (and (eolp)
(not (eobp)))
(forward-line 1))
(point))))
(defun message-in-body-p ()
"Return t if point is in the message body."
(>= (point)
(save-excursion
(message-goto-body-1)
(point))))
(message-goto-body-1))))
(defun message-goto-eoh ()
"Move point to the end of the headers."