summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2016-03-20 13:57:11 +0100
committerLars Magne Ingebrigtsen <larsi@gnus.org>2016-03-20 13:57:11 +0100
commitf2da80d0e1ccd121c4891e869a45aeb9c6b1795d (patch)
tree2357ccd71314674f33b0eb74696f9be532ba7870
parent4f6ea3988b66cf132c67fd0cc26d12eb9a300ba1 (diff)
downloademacs-f2da80d0e1ccd121c4891e869a45aeb9c6b1795d.tar.gz
Ignore invalid base64 encoded embedded images
* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64 encoded embedded images (bug#22928).
-rw-r--r--lisp/net/shr.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 4f64618c008..cd55f223cf6 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -946,7 +946,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.