peiyongz 2003/02/04 09:15:37
Modified: c/src/xercesc/internal SGXMLScanner.cpp IGXMLScanner2.cpp
Log:
bug#16652: data from CDATA section is not passed for validation
Revision Changes Path
1.14 +7 -1 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SGXMLScanner.cpp 29 Jan 2003 19:59:35 -0000 1.13
+++ SGXMLScanner.cpp 4 Feb 2003 17:15:36 -0000 1.14
@@ -3534,6 +3534,12 @@
if (fMatcherStack->getMatcherCount())
fContent.append(bbCData.getRawBuffer(), bbCData.getLen());
+ // tell the schema validation about the character data for checkContent
later
+ if (fValidate && fSchemaValidator)
+ {
+ fSchemaValidator->setDatatypeBuffer(bbCData.getRawBuffer());
+ }
+
// If we have a doc handler, call it
if (fDocHandler)
{
1.11 +7 -1 xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
Index: IGXMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- IGXMLScanner2.cpp 29 Jan 2003 19:59:35 -0000 1.10
+++ IGXMLScanner2.cpp 4 Feb 2003 17:15:36 -0000 1.11
@@ -2031,6 +2031,12 @@
fContent.append(bbCData.getRawBuffer(), bbCData.getLen());
}
+ // tell the schema validation about the character data for checkContent
later
+ if (fValidate && fSchemaValidator)
+ {
+ fSchemaValidator->setDatatypeBuffer(bbCData.getRawBuffer());
+ }
+
// If we have a doc handler, call it
if (fDocHandler)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
