From 78c680884a2f6485ecc4012869962ed82dced60d Mon Sep 17 00:00:00 2001 From: dlichteblau Date: Sun, 27 Nov 2005 00:36:47 +0000 Subject: [PATCH] -ibm/not-wf/P14/ibm14n01.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CharData. The content of the element "student" contains the - character "[[>". - ] --- XMLCONF | 9 ++------- xml/xml-parse.lisp | 2 ++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/XMLCONF b/XMLCONF index ff28854..61f1319 100644 --- a/XMLCONF +++ b/XMLCONF @@ -992,12 +992,7 @@ ibm/not-wf/P12/ibm12n03.xml [not-wf?] not-wf ibm/not-wf/P13/ibm13n01.xml [not-wf?] not-wf ibm/not-wf/P13/ibm13n02.xml [not-wf?] not-wf ibm/not-wf/P13/ibm13n03.xml [not-wf?] not-wf -ibm/not-wf/P14/ibm14n01.xml [not-wf?] FAILED: - well-formedness violation not detected -[ - Tests CharData. The content of the element "student" contains the - character "[[>". - ] +ibm/not-wf/P14/ibm14n01.xml [not-wf?] not-wf ibm/not-wf/P14/ibm14n02.xml [not-wf?] not-wf ibm/not-wf/P14/ibm14n03.xml [not-wf?] not-wf ibm/not-wf/P15/ibm15n01.xml [not-wf?] not-wf @@ -1823,4 +1818,4 @@ ibm/valid/P86/ibm86v01.xml [not validating:] input [validating:] input ibm/valid/P87/ibm87v01.xml [not validating:] input [validating:] input ibm/valid/P88/ibm88v01.xml [not validating:] input [validating:] input ibm/valid/P89/ibm89v01.xml [not validating:] input [validating:] input -7/1786 tests failed; 376 tests were skipped \ No newline at end of file +6/1786 tests failed; 376 tests were skipped \ No newline at end of file diff --git a/xml/xml-parse.lisp b/xml/xml-parse.lisp index e4a506c..5c8c785 100644 --- a/xml/xml-parse.lisp +++ b/xml/xml-parse.lisp @@ -2671,6 +2671,8 @@ (p/content input)) ((:CDATA) (consume-token input) + (when (search #"]]>" sem) + (wf-error "']]>' not allowed in CharData")) (validate-characters *ctx* sem) (sax:characters (handler *ctx*) sem) (p/content input))