(nnimap-transform-headers): Simplify regexp to hopefully avoid regexp overflow.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4fdd08..d353f02 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * 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  <larsi@gnus.org>

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 6882ed6..e2953ff 100644 (file)
--- 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)))