lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-08-01 10:06:59 +03:00
Code Activity

fixed a problem with validation within entities pointed by Stphane

Browse Source 
* xmlreader.c python/tests/reader2.py: fixed a problem with
  validation within entities pointed by Stphane Bidoul, augmented
  the tests to catch those.
Daniel
This commit is contained in:
Daniel Veillard
2002-12-31 14:45:26 +00:00
parent dc85f28f66
commit d589614042
3 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Dec 31 15:44:02 CET 2002 Daniel Veillard <daniel@veillard.com>
* xmlreader.c python/tests/reader2.py: fixed a problem with
validation within entities pointed by St<53>phane Bidoul, augmented
the tests to catch those.
Tue Dec 31 12:15:37 CET 2002 Daniel Veillard <daniel@veillard.com> Tue Dec 31 12:15:37 CET 2002 Daniel Veillard <daniel@veillard.com>
* python/generator.py: modified the generator to allow keeping * python/generator.py: modified the generator to allow keeping

53
python/tests/reader2.py
View File

@ -5,6 +5,7 @@
import sys import sys
import glob import glob
import string import string
import StringIO
import libxml2 import libxml2
# Memory debug specific # Memory debug specific
@ -43,6 +44,58 @@ for file in valid_files:
if err != expect: if err != expect:
print err print err
#
# another separate test based on Stephane Bidoul one
#
s = """
<!DOCTYPE test [
<!ELEMENT test (x,b)>
<!ELEMENT x (c)>
<!ELEMENT b (#PCDATA)>
<!ELEMENT c (#PCDATA)>
<!ENTITY x "<x><c>xxx</c></x>">
]>
<test>
&x;
<b>bbb</b>
</test>
"""
expect="""1,test
3,#text
1,x
1,c
3,#text
15,c
15,x
3,#text
1,b
3,#text
15,b
3,#text
15,test
"""
res=""
err=""
input = libxml2.inputBuffer(StringIO.StringIO(s))
reader = input.newTextReader("test2")
reader.SetParserProp(libxml2.PARSER_LOADDTD,1)
reader.SetParserProp(libxml2.PARSER_DEFAULTATTRS,1)
reader.SetParserProp(libxml2.PARSER_SUBST_ENTITIES,1)
reader.SetParserProp(libxml2.PARSER_VALIDATE,1)
while reader.Read() == 1:
res = res + "%s,%s\n" % (reader.NodeType(),reader.Name())
if res != expect:
print "test2 failed: unexpected output"
print res
sys.exit(1)
if err != "":
print "test2 failed: validation error found"
print err
sys.exit(1)
del input
del reader del reader
# Memory debug specific # Memory debug specific

31
xmlreader.c
View File

@ -134,16 +134,21 @@ static void
xmlTextReaderStartElement(void *ctx, const xmlChar *fullname, xmlTextReaderStartElement(void *ctx, const xmlChar *fullname,
const xmlChar **atts) { const xmlChar **atts) {
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
xmlParserCtxtPtr origctxt;
xmlTextReaderPtr reader = ctxt->_private; xmlTextReaderPtr reader = ctxt->_private;
#ifdef DEBUG_CALLBACKS #ifdef DEBUG_CALLBACKS
printf("xmlTextReaderStartElement(%s)\n", fullname); printf("xmlTextReaderStartElement(%s)\n", fullname);
#endif #endif
if ((reader != NULL) && (reader->startElement != NULL)) { if ((reader != NULL) && (reader->startElement != NULL)) {
/*
* when processing an entity, the context may have been changed
*/
origctxt = reader->ctxt;
reader->startElement(ctx, fullname, atts); reader->startElement(ctx, fullname, atts);
if (ctxt->validate) { if (origctxt->validate) {
ctxt->valid &= xmlValidatePushElement(&ctxt->vctxt, ctxt->myDoc, ctxt->valid &= xmlValidatePushElement(&origctxt->vctxt,
ctxt->node, fullname); ctxt->myDoc, ctxt->node, fullname);
} }
} }
reader->state = XML_TEXTREADER_ELEMENT; reader->state = XML_TEXTREADER_ELEMENT;
@ -159,6 +164,7 @@ xmlTextReaderStartElement(void *ctx, const xmlChar *fullname,
static void static void
xmlTextReaderEndElement(void *ctx, const xmlChar *fullname) { xmlTextReaderEndElement(void *ctx, const xmlChar *fullname) {
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
xmlParserCtxtPtr origctxt;
xmlTextReaderPtr reader = ctxt->_private; xmlTextReaderPtr reader = ctxt->_private;
#ifdef DEBUG_CALLBACKS #ifdef DEBUG_CALLBACKS
@ -166,12 +172,16 @@ xmlTextReaderEndElement(void *ctx, const xmlChar *fullname) {
#endif #endif
if ((reader != NULL) && (reader->endElement != NULL)) { if ((reader != NULL) && (reader->endElement != NULL)) {
xmlNodePtr node = ctxt->node; xmlNodePtr node = ctxt->node;
/*
* when processing an entity, the context may have been changed
*/
origctxt = reader->ctxt;
reader->endElement(ctx, fullname); reader->endElement(ctx, fullname);
if (ctxt->validate) { if (origctxt->validate) {
ctxt->valid &= xmlValidatePopElement(&ctxt->vctxt, ctxt->myDoc, ctxt->valid &= xmlValidatePopElement(&origctxt->vctxt,
node, fullname); ctxt->myDoc, node, fullname);
} }
} }
if (reader->state == XML_TEXTREADER_ELEMENT) if (reader->state == XML_TEXTREADER_ELEMENT)
@ -192,6 +202,7 @@ static void
xmlTextReaderCharacters(void *ctx, const xmlChar *ch, int len) xmlTextReaderCharacters(void *ctx, const xmlChar *ch, int len)
{ {
xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
xmlParserCtxtPtr origctxt;
xmlTextReaderPtr reader = ctxt->_private; xmlTextReaderPtr reader = ctxt->_private;
#ifdef DEBUG_CALLBACKS #ifdef DEBUG_CALLBACKS
@ -199,9 +210,13 @@ xmlTextReaderCharacters(void *ctx, const xmlChar *ch, int len)
#endif #endif
if ((reader != NULL) && (reader->characters != NULL)) { if ((reader != NULL) && (reader->characters != NULL)) {
reader->characters(ctx, ch, len); reader->characters(ctx, ch, len);
/*
* when processing an entity, the context may have been changed
*/
origctxt = reader->ctxt;
if (ctxt->validate) { if (origctxt->validate) {
ctxt->valid &= xmlValidatePushCData(&ctxt->vctxt, ch, len); ctxt->valid &= xmlValidatePushCData(&origctxt->vctxt, ch, len);
} }
} }
} }