From c10524726e0a91445a0329cc9aa72b7467258381 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 23 Sep 2019 10:35:29 +0530 Subject: email: Tolerate non-ASCII non-UTF-8 characters in headers. * email/email.scm (email->headers+body): If non-ASCII non-UTF-8 characters occur in the headers, do not raise a decoding error. Work around using the substitute conversion strategy. * tests/email.scm ("tolerate non-ASCII characters in headers"): Rename to "decode utf-8 characters in headers". ("tolerate non-ascii non-utf-8 characters in headers"): New test. Reported-by: Christopher Baines --- email/email.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'email') diff --git a/email/email.scm b/email/email.scm index f276019..6ed285f 100644 --- a/email/email.scm +++ b/email/email.scm @@ -611,8 +611,11 @@ values. The returned headers is a string and body is a bytevector." ;; name, we relax this requirement. We assume an encoding of ;; UTF-8, and hope that everything turns out fine. Since UTF-8 ;; is a superset of ASCII, this should not affect standards - ;; conforming headers. + ;; conforming headers. If encoding is neither UTF-8 nor ASCII, + ;; we use the substitute conversion strategy and proceed without + ;; raising an error. (set-port-encoding! port "utf-8") + (set-port-conversion-strategy! port 'substitute) (let ((headers (read-while port get-line-with-delimiter (lambda (line) (not (or (string= line "\n") -- cgit v1.2.3