mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

* xml.el (xml-parse-dtd): Use proper regexps for ELEMENT declarations.

Browse Source 
* test/automated/xml-parse-tests.el: Update testcase.

Fixes: debbugs:7172
This commit is contained in:
Chong Yidong 2012-07-01 19:05:17 +08:00
parent 7c603e3ed3
commit 6fe566a752
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/ChangeLog
View File

@ -7,6 +7,7 @@
Use xml--parse-buffer.
(xml-parse-file): Use xml--parse-buffer.
(xml-parse-dtd): Make parameter entity substitution work right.
Use proper regexps for ELEMENT declarations (Bug#7172).
2012-06-30 Glenn Morris <rgm@gnu.org>

15
lisp/xml.el
View File

@ -651,7 +651,9 @@ This follows the rule [28] in the XML specifications."
(skip-syntax-forward " ")
(cond
;; Element declaration [45]:
((and (looking-at "<!ELEMENT\\s-+\\([[:alnum:].%;]+\\)\\s-+\\([^>]+\\)>")
((and (looking-at (eval-when-compile
(concat "<!ELEMENT\\s-+\\(" xml-name-re
"\\)\\s-+\\([^>]+\\)>")))
(or (null next-parameter-entity)
(<= (match-end 0) next-parameter-entity)))
(let ((element (match-string-no-properties 1))
@ -659,13 +661,14 @@ This follows the rule [28] in the XML specifications."
(end-pos (match-end 0)))
;; Translation of rule [46] of XML specifications
(cond
((string-match "^EMPTY[ \t\n\r]*$" type) ; empty declaration
((string-match "\\`EMPTY\\s-*\\'" type) ; empty declaration
(setq type 'empty))
((string-match "^ANY[ \t\n\r]*$" type) ; any type of contents
((string-match "\\`ANY\\s-*$" type) ; any type of contents
(setq type 'any))
((string-match "^(\\(.*\\))[ \t\n\r]*$" type) ; children ([47])
(setq type (xml-parse-elem-type (match-string-no-properties 1 type))))
((string-match "^%[^;]+;[ \t\n\r]*$" type) ; substitution
((string-match "\\`(\\(.*\\))\\s-*\\'" type) ; children ([47])
(setq type (xml-parse-elem-type
(match-string-no-properties 1 type))))
((string-match "^%[^;]+;[ \t\n\r]*\\'" type) ; substitution
nil)
(xml-validating-parser
(error "XML: (Validity) Invalid element type in the DTD")))

5
test/automated/xml-parse-tests.el
View File

@ -38,7 +38,10 @@
((foo ((a . "b")) (bar nil "AbC;"))))
;; Tricky parameter entity substitution (like XML spec Appendix D)
("<?xml version='1.0'?><!DOCTYPE foo [ <!ENTITY % xx '&#37;zz;'><!ENTITY % zz '&#60;!ENTITY ent \"b\" >' > %xx; ]><foo>A&ent;C</foo>" .
((foo nil "AbC"))))
((foo nil "AbC")))
;; Bug#7172
("<?xml version=\"1.0\"?><!DOCTYPE foo [ <!ELEMENT EXAM_PLE EMPTY> ]><foo></foo>" .
((foo nil))))
"Alist of XML strings and their expected parse trees.")
(ert-deftest xml-parse-tests ()