diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/gnus/gnus-html.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4737a414545..3cc5be14af5 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,8 @@ 2010-10-01 Lars Magne Ingebrigtsen <larsi@gnus.org> + * gnus-html.el (gnus-html-prefetch-images): Adjust regexp to avoid + regexp backtrace overflows. + * nnimap.el (nnimap-extend-tls-programs): Only extend those programs for starttls that tls.el implements; i.e. openssl. diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index 587c28e974a..fee9eee0f9e 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -500,7 +500,7 @@ This only works if the article in question is HTML." (let ((blocked-images (with-current-buffer summary gnus-blocked-images))) (save-match-data - (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t) + (while (re-search-forward "<img[^>]+src=[\"']\\([^\"']+\\)" nil t) (let ((url (gnus-html-encode-url (match-string 1)))) (unless (gnus-html-image-url-blocked-p url blocked-images) (when (gnus-html-cache-expired url gnus-html-image-cache-ttl) |