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

parser: Consolidate error handling for undeclared entities

Browse Source 
Always use XML_WAR_UNDECLARED_ENTITY with warning error level in
documents with external subset or parameter entities. Use
XML_ERR_UNDECLARED_ENTITY otherwise.
This commit is contained in:
Nick Wellnhofer
2024-04-22 15:42:39 +02:00
parent 00336f0fee
commit b717abdd09
12 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parser.c
View File

@@ -7600,8 +7600,8 @@ xmlLookupGeneralEntity(xmlParserCtxtPtr ctxt, const xmlChar *name, int inAttr) {
xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY, xmlFatalErrMsgStr(ctxt, XML_ERR_UNDECLARED_ENTITY,
"Entity '%s' not defined\n", name); "Entity '%s' not defined\n", name);
} else { } else {
xmlErrMsgStr(ctxt, XML_WAR_UNDECLARED_ENTITY, xmlWarningMsg(ctxt, XML_WAR_UNDECLARED_ENTITY,
"Entity '%s' not defined\n", name); "Entity '%s' not defined\n", name, NULL);
if ((ctxt->inSubset == 0) && if ((ctxt->inSubset == 0) &&
(ctxt->sax != NULL) && (ctxt->sax != NULL) &&
(ctxt->disableSAX == 0) && (ctxt->disableSAX == 0) &&
@@ -7844,7 +7844,7 @@ xmlParsePEReference(xmlParserCtxtPtr ctxt)
* precede any reference to it... * precede any reference to it...
*/ */
if ((ctxt->validate) && (ctxt->vctxt.error != NULL)) { if ((ctxt->validate) && (ctxt->vctxt.error != NULL)) {
xmlValidityError(ctxt, XML_WAR_UNDECLARED_ENTITY, xmlValidityError(ctxt, XML_ERR_UNDECLARED_ENTITY,
"PEReference: %%%s; not found\n", "PEReference: %%%s; not found\n",
name, NULL); name, NULL);
} else } else

4
python/tests/input_callback.py
View File

@@ -101,7 +101,7 @@ run_test(desc="Loading entity with custom callback",
exp_status="loaded", exp_err=[ exp_status="loaded", exp_err=[
( 3, 'failed to load "http://example.com/dtds/sample.dtd": Attempt to load network entity\n'), ( 3, 'failed to load "http://example.com/dtds/sample.dtd": Attempt to load network entity\n'),
( -1, "Attempt to load network entity: http://example.com/dtds/sample.dtd"), ( -1, "Attempt to load network entity: http://example.com/dtds/sample.dtd"),
( 4, "Entity 'sample.entity' not defined\n") ( 3, "Entity 'sample.entity' not defined\n")
]) ])
# Register a catalog (also accessible via pystr://) and retry # Register a catalog (also accessible via pystr://) and retry
@@ -114,7 +114,7 @@ run_test(desc="Loading entity and unregistering callback",
test_callback=lambda: libxml2.popInputCallbacks(), test_callback=lambda: libxml2.popInputCallbacks(),
exp_status="loaded", exp_err=[ exp_status="loaded", exp_err=[
( 3, "failed to load \"py://strings/dtds/sample.dtd\": No such file or directory\n"), ( 3, "failed to load \"py://strings/dtds/sample.dtd\": No such file or directory\n"),
( 4, "Entity 'sample.entity' not defined\n") ( 3, "Entity 'sample.entity' not defined\n")
]) ])
# Try to load the document again # Try to load the document again

2
result/ent7.sax
View File

@@ -1,4 +1,4 @@
xmlSAXUserParseFile returned error 27 xmlParseDocument returned error 26
SAX.setDocumentLocator() SAX.setDocumentLocator()
SAX.startDocument() SAX.startDocument()
SAX.internalSubset(item, , ) SAX.internalSubset(item, , )

2
result/ent7.sax2
View File

@@ -1,4 +1,4 @@
xmlSAXUserParseFile returned error 27 xmlParseDocument returned error 26
SAX.setDocumentLocator() SAX.setDocumentLocator()
SAX.startDocument() SAX.startDocument()
SAX.internalSubset(item, , ) SAX.internalSubset(item, , )

2
result/errors/rec_att_default.xml.ent
View File

@@ -1,4 +1,4 @@
./test/errors/rec_att_default.xml:3: parser error : Entity 'b' not defined ./test/errors/rec_att_default.xml:3: parser warning : Entity 'b' not defined
<!ATTLIST x y CDATA "&a;"> <!ATTLIST x y CDATA "&a;">
^ ^
./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop ./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop

2
result/errors/rec_att_default.xml.err
View File

@@ -1,4 +1,4 @@
./test/errors/rec_att_default.xml:3: parser error : Entity 'b' not defined ./test/errors/rec_att_default.xml:3: parser warning : Entity 'b' not defined
<!ATTLIST x y CDATA "&a;"> <!ATTLIST x y CDATA "&a;">
^ ^
./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop ./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop

2
result/errors/rec_att_default.xml.str
View File

@@ -1,4 +1,4 @@
./test/errors/rec_att_default.xml:3: parser error : Entity 'b' not defined ./test/errors/rec_att_default.xml:3: parser warning : Entity 'b' not defined
<!ATTLIST x y CDATA "&a;"> <!ATTLIST x y CDATA "&a;">
^ ^
./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop ./test/errors/rec_att_default.xml:6: parser error : Detected an entity reference loop

2
result/noent/ent7.sax2
View File

@@ -1,4 +1,4 @@
xmlSAXUserParseFile returned error 27 xmlParseDocument returned error 26
SAX.setDocumentLocator() SAX.setDocumentLocator()
SAX.startDocument() SAX.startDocument()
SAX.internalSubset(item, , ) SAX.internalSubset(item, , )

2
result/noent/xml2.sax2
View File

@@ -1,4 +1,4 @@
xmlSAXUserParseFile returned error 27 xmlParseDocument returned error 26
SAX.setDocumentLocator() SAX.setDocumentLocator()
SAX.startDocument() SAX.startDocument()
SAX.internalSubset(test, , ) SAX.internalSubset(test, , )

2
result/xml2.sax
View File

@@ -1,4 +1,4 @@
xmlSAXUserParseFile returned error 27 xmlParseDocument returned error 26
SAX.setDocumentLocator() SAX.setDocumentLocator()
SAX.startDocument() SAX.startDocument()
SAX.internalSubset(test, , ) SAX.internalSubset(test, , )

2
result/xml2.sax2
View File

@@ -1,4 +1,4 @@
xmlSAXUserParseFile returned error 27 xmlParseDocument returned error 26
SAX.setDocumentLocator() SAX.setDocumentLocator()
SAX.startDocument() SAX.startDocument()
SAX.internalSubset(test, , ) SAX.internalSubset(test, , )

8
runtest.c
View File

@@ -1515,8 +1515,8 @@ saxParseTest(const char *filename, const char *result,
xmlFreeDoc(ctxt->myDoc); xmlFreeDoc(ctxt->myDoc);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
} }
if (ret == XML_WAR_UNDECLARED_ENTITY) { if (ret == XML_ERR_UNDECLARED_ENTITY) {
fprintf(SAXdebug, "xmlSAXUserParseFile returned error %d\n", ret); fprintf(SAXdebug, "xmlParseDocument returned error %d\n", ret);
ret = 0; ret = 0;
} }
if (ret != 0) { if (ret != 0) {
@@ -1556,10 +1556,6 @@ saxParseTest(const char *filename, const char *result,
xmlFreeDoc(ctxt->myDoc); xmlFreeDoc(ctxt->myDoc);
xmlFreeParserCtxt(ctxt); xmlFreeParserCtxt(ctxt);
} }
if (ret == XML_WAR_UNDECLARED_ENTITY) {
fprintf(SAXdebug, "xmlSAXUserParseFile returned error %d\n", ret);
ret = 0;
}
fclose(SAXdebug); fclose(SAXdebug);
if (compareFiles(temp, result)) { if (compareFiles(temp, result)) {
fprintf(stderr, "Got a difference for %s\n", filename); fprintf(stderr, "Got a difference for %s\n", filename);