[Emacs-diffs] emacs-25 d8b2ce5 1/2: Ignore invalid base64 encoded embedded images

[Lars Ingebrigtsen]

branch: emacs-25
commit d8b2ce5f8a6a849e55b48699dfa0e769a4b9a3f6
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    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:
---
 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 900b8ec..07fcbeb 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.