* lisp/simple.el (save-mark-and-excursion): Add declare forms.

[gnu-emacs] / lisp / xml.el

diff --git a/lisp/xml.el b/lisp/xml.el
index 2c3b6a49f61c211e9a493b7379c46404457884c1..414300cb40207259c7de62d90f8572447c5c0ed0 100644 (file)
--- 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 (zerop (length 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.