procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix storing email into nnmail by Gnus

Browse source 
* lisp/gnus/nnml.el (nnml--encode-headers): Wrap
'rfc2047-encode-string' calls with 'ignore-errors', to avoid
disrupting email workflows due to possibly-invalid headers.
Reported by Florian Weimer <fweimer@redhat.com>.
This commit is contained in:
Eli Zaretskii 2022-12-19 19:01:04 +02:00
parent 63cdbd986b
commit 23f7c9c2a9
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/gnus/nnml.el
View file

@ -776,17 +776,22 @@ article number. This function is called narrowed to an article."
(nnml--encode-headers headers)
headers))))
;; RFC2047-encode Subject and From, but leave invalid headers unencoded.
(defun nnml--encode-headers (headers)
(let ((subject (mail-header-subject headers))
(rfc2047-encoding-type 'mime))
(unless (string-match "\\`[[:ascii:]]*\\'" subject)
(setf (mail-header-subject headers)
(mail-encode-encoded-word-string subject t))))
(let ((encoded-subject
(ignore-errors (mail-encode-encoded-word-string subject t))))
(if encoded-subject
(setf (mail-header-subject headers) encoded-subject)))))
(let ((from (mail-header-from headers))
(rfc2047-encoding-type 'address-mime))
(unless (string-match "\\`[[:ascii:]]*\\'" from)
(setf (mail-header-from headers)
(rfc2047-encode-string from t)))))
(let ((encoded-from
(ignore-errors (rfc2047-encode-string from t))))
(if encoded-from
(setf (mail-header-from headers) encoded-from))))))
(defun nnml-get-nov-buffer (group &optional incrementalp)
(let ((buffer (gnus-get-buffer-create