[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 8b01e69: Prevent infinite loop on not-well-formed
From: |
Ulf Jasper |
Subject: |
[Emacs-diffs] emacs-25 8b01e69: Prevent infinite loop on not-well-formed xml. (Bug#16344) |
Date: |
Wed, 02 Mar 2016 18:04:10 +0000 |
branch: emacs-25
commit 8b01e6969f9e53a226d489cb721a7493fb3ad2de
Author: Ulf Jasper <address@hidden>
Commit: Ulf Jasper <address@hidden>
Prevent infinite loop on not-well-formed xml. (Bug#16344)
* lisp/xml.el (xml-parse-tag-1): Prevent inifinite loop. (Bug#16344)
* test/automated/xml-parse-tests.el (xml-parse-tests--bad-data): Add
test cases for Bug#16344.
---
lisp/xml.el | 9 ++++++++-
test/automated/xml-parse-tests.el | 7 ++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lisp/xml.el b/lisp/xml.el
index 2c3b6a4..1802d04 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -579,7 +579,14 @@ Return one of:
(error "XML: (Well-Formed) Invalid character"))
;; However, if we're parsing incrementally, then we need to deal
;; with stray CDATA.
- (xml-parse-string)))))
+ (let ((s (xml-parse-string)))
+ (when (string-empty-p s)
+ ;; We haven't consumed any input! We must throw an error in
+ ;; order to prevent looping forever.
+ (error "XML: (Not Well-Formed) Could not parse: %s"
+ (buffer-substring-no-properties
+ (point) (min (+ (point) 10) (point-max)))))
+ s)))))
(defun xml-parse-string ()
"Parse character data at point, and return it as a string.
diff --git a/test/automated/xml-parse-tests.el
b/test/automated/xml-parse-tests.el
index 763febb..488d2c6 100644
--- a/test/automated/xml-parse-tests.el
+++ b/test/automated/xml-parse-tests.el
@@ -72,7 +72,12 @@
;; Invalid XML names
"<0foo>abc</0foo>"
"<‿foo>abc</‿foo>"
- "<f¿>abc</f¿>")
+ "<f¿>abc</f¿>"
+ ;; Two root tags
+ "<a/><b></b>"
+ ;; Bug#16344
+ "<!----><x>< /x>"
+ "<a>< b/></a>")
"List of XML strings that should signal an error in the parser")
(defvar xml-parse-tests--qnames
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 8b01e69: Prevent infinite loop on not-well-formed xml. (Bug#16344),
Ulf Jasper <=