[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp

[David Lichteblau]

Update of /project/cxml/cvsroot/cxml/xml
In directory common-lisp.net:/tmp/cvs-serv27042/xml

Modified Files:
	xml-parse.lisp 
Log Message:
-ibm/not-wf/P10/ibm10n01.xml [not-wf?] FAILED:
-  well-formedness violation not detected
-[
-    Tests an attribute with an invalid value. The value of the attribute "first
"
-    contains the character "less than".
-  ]
-ibm/not-wf/P10/ibm10n05.xml [not-wf?] FAILED:
-  well-formedness violation not detected
-[
-    Tests an attribute with an invalid value. The value of the attribute "first
"
-    contains the character "less than".
-  ]

Date: Sun Nov 27 01:33:55 2005
Author: dlichteblau

Index: cxml/xml/xml-parse.lisp
diff -u cxml/xml/xml-parse.lisp:1.15 cxml/xml/xml-parse.lisp:1.16
--- cxml/xml/xml-parse.lisp:1.15	Sun Nov 27 01:28:29 2005
+++ cxml/xml/xml-parse.lisp	Sun Nov 27 01:33:55 2005
@@ -1368,9 +1368,7 @@
                       (rune= c #/U+000A)
                       (rune= c #/U+000D))))
       (consume-rune input))
-    (cons name (read-att-value-2 input))
-    ;;(cons name (read-att-value zinput input :ATT t))
-    ))
+    (cons name (read-att-value-2 input))))
 
 (defun canon-not-cdata-attval (value)
   ;; | If the declared value is not CDATA, then the XML processor must
@@ -3283,6 +3281,8 @@
                  (error "EOF"))
                 ((rune= c delim)
                  (return))
+                ((rune= c #/<)
+		 (wf-error "'<' not allowed in attribute values"))
                 ((rune= #/& c)
                  (multiple-value-bind (kind sem) (read-entity-ref input)
                    (ecase kind