procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace NUL characters when calling into libxml

Browse source 
2019-02-27  Robert Pluim  <rpluim@gmail.com>

* lisp/net/eww.el (eww-display-html): Replace NUL characters with
"\0", as libxml can't handle embedded NULLs.  (Bug#34469)
This commit is contained in:
Robert Pluim 2019-02-26 16:37:09 +01:00
parent 9564fc33f5
commit d07f3aae48
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/net/eww.el
View file

@ -470,10 +470,12 @@ Currently this means either text/html or application/xhtml+xml."
(condition-case nil
(decode-coding-region (point) (point-max) encode)
(coding-system-error nil))
(save-excursion
;; Remove CRLF before parsing.
(while (re-search-forward "\r$" nil t)
(replace-match "" t t)))
(save-excursion
;; Remove CRLF and NULL before parsing.
(while (re-search-forward "\\(\r$\\)\\|\\(\000\\)" nil t)
(replace-match (if (match-beginning 1)
""
"\\0") t t)))
(libxml-parse-html-region (point) (point-max))))))
(source (and (null document)
(buffer-substring (point) (point-max)))))