From 8c6c0ff128db6435a2f743f3d3890756f1215b88 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 30 May 2011 20:25:47 +0200 Subject: [PATCH] (nnimap-transform-headers): Simplify regexp to hopefully avoid regexp overflow. --- lisp/ChangeLog | 4 ++++ lisp/nnimap.el | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4fdd082b..d353f02d3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-05-30 Lars Magne Ingebrigtsen + * nnimap.el (nnimap-transform-headers): Simplify regexp to hopefully + avoid regexp overflow. + (nnimap-transform-split-mail): Ditto. + * pop3.el (pop3-retr): Error out if the server closes the connection. 2011-05-29 Lars Magne Ingebrigtsen diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 6882ed631..e2953ff40 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -190,7 +190,7 @@ textual parts.") (let (article bytes lines size string) (block nil (while (not (eobp)) - (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)")) + (while (not (looking-at "\\* [0-9]+ FETCH.+UID [0-9]+")) (delete-region (point) (progn (forward-line 1) (point))) (when (eobp) (return))) @@ -1904,7 +1904,7 @@ textual parts.") (let (article bytes) (block nil (while (not (eobp)) - (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)")) + (while (not (looking-at "\\* [0-9]+ FETCH.+UID [0-9]+")) (delete-region (point) (progn (forward-line 1) (point))) (when (eobp) (return))) -- 2.25.1