diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2016-03-20 13:57:11 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2016-03-20 13:58:04 +0100 |
| commit | d8b2ce5f8a6a849e55b48699dfa0e769a4b9a3f6 (patch) | |
| tree | c9530e1c46be4f7b0ab7602235ede44ac4ba31c0 /lisp | |
| parent | 52ba24bdd913f6be8318c34b281c7ad727dee6ad (diff) | |
| download | emacs-d8b2ce5f8a6a849e55b48699dfa0e769a4b9a3f6.tar.gz | |
Ignore invalid base64 encoded embedded images
* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64
encoded embedded images (bug#22928).
(cherry picked from commit f2da80d0e1ccd121c4891e869a45aeb9c6b1795d)
Backport:
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/shr.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 900b8ec3f5c..07fcbebce08 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -924,7 +924,8 @@ If EXTERNAL, browse the URL using `shr-external-browser'." (let ((param (match-string 4 data)) (payload (url-unhex-string (match-string 5 data)))) (when (string-match "^.*\\(;[ \t]*base64\\)$" param) - (setq payload (base64-decode-string payload))) + (setq payload (ignore-errors + (base64-decode-string payload)))) payload))) ;; Behind display-graphic-p test. |