[Emacs-diffs] master 25f45d7: Avoid bugging out on multibyte SVG data in shr

[Lars Ingebrigtsen]

branch: master
commit 25f45d710e91a7c1049f056ff27bc3e6968f5624
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Avoid bugging out on multibyte SVG data in shr
    
    * lisp/net/shr.el (svg--wrap-svg): Ensure that the SVG data is
    unibyte.
---
 lisp/net/shr.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index dc3cc38..ef236bf 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1199,7 +1199,9 @@ Return a string with image data."
         "<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\"; 
xmlns:xi=\"http://www.w3.org/2001/XInclude\"; style=\"color: %s;\" viewBox=\"0 0 
%d %d\"> <xi:include href=\"data:image/svg+xml;base64,%s\"></xi:include></svg>"
         (face-foreground 'default)
         (car size) (cdr size)
-        (base64-encode-string data t)))
+        (base64-encode-string (encode-coding-string
+                               data (car (detect-coding-string data)))
+                              t)))
       (buffer-string))))
 
 (defun shr-image-displayer (content-function)