mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2024-10-26 12:25:09 +03:00
parser: Report fatal error if document entity couldn't be loaded
Only lower error level when loading entities. Fixes #667.
This commit is contained in:
parent
37d474ff7e
commit
63986c45b9
@ -175,9 +175,15 @@ xmlCtxtErrIO(xmlParserCtxtPtr ctxt, int code, const char *uri)
|
||||
if (ctxt == NULL)
|
||||
return;
|
||||
|
||||
if ((code == XML_IO_ENOENT) ||
|
||||
(code == XML_IO_NETWORK_ATTEMPT) ||
|
||||
(code == XML_IO_UNKNOWN)) {
|
||||
/*
|
||||
* Don't report a well-formedness error if an external entity could
|
||||
* not be found. We assume that inputNr is zero for the document
|
||||
* entity which is somewhat fragile.
|
||||
*/
|
||||
if ((ctxt->inputNr > 0) &&
|
||||
((code == XML_IO_ENOENT) ||
|
||||
(code == XML_IO_NETWORK_ATTEMPT) ||
|
||||
(code == XML_IO_UNKNOWN))) {
|
||||
if (ctxt->validate == 0)
|
||||
level = XML_ERR_WARNING;
|
||||
else
|
||||
|
@ -10,7 +10,7 @@ import libxml2
|
||||
# Memory debug specific
|
||||
libxml2.debugMemory(1)
|
||||
|
||||
expect='--> I/O --> warning : --> failed to load "missing.xml": No such file or directory\n'
|
||||
expect='--> I/O --> error : --> failed to load "missing.xml": No such file or directory\n'
|
||||
err=""
|
||||
def callback(ctx, str):
|
||||
global err
|
||||
|
@ -90,7 +90,7 @@ run_test(desc="Loading entity without custom callback",
|
||||
docpath=startURL, catalog=None,
|
||||
exp_status="not loaded", exp_err=[
|
||||
(-1, "I/O "),
|
||||
(-1, "warning : "),
|
||||
(-1, "error : "),
|
||||
(-1, "failed to load \"py://strings/xml/sample.xml\": No such file or directory\n")
|
||||
])
|
||||
|
||||
@ -122,7 +122,7 @@ run_test(desc="Retry loading document after unregistering callback",
|
||||
docpath=startURL, catalog=catURL,
|
||||
exp_status="not loaded", exp_err=[
|
||||
(-1, "I/O "),
|
||||
(-1, "warning : "),
|
||||
(-1, "error : "),
|
||||
(-1, "failed to load \"py://strings/xml/sample.xml\": No such file or directory\n")
|
||||
])
|
||||
|
||||
@ -142,7 +142,7 @@ run_test(desc="Loading using standard i/o after unregistering all callbacks",
|
||||
docpath="tst.xml", catalog=None,
|
||||
exp_status="not loaded", exp_err=[
|
||||
(-1, "I/O "),
|
||||
(-1, "warning : "),
|
||||
(-1, "error : "),
|
||||
(-1, "failed to load \"tst.xml\": No such file or directory\n")
|
||||
])
|
||||
|
||||
|
@ -60,7 +60,7 @@ class TestCase(unittest.TestCase):
|
||||
domain=libxml2.XML_FROM_IO,
|
||||
code=libxml2.XML_IO_ENOENT,
|
||||
message='failed to load "dummy.xml": No such file or directory\n',
|
||||
level=libxml2.XML_ERR_WARNING,
|
||||
level=libxml2.XML_ERR_FATAL,
|
||||
file=None,
|
||||
line=0)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
I/O warning : failed to load "test/XInclude/docs/something.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/something.xml": No such file or directory
|
||||
|
@ -1,2 +1,2 @@
|
||||
I/O warning : failed to load "test/XInclude/docs/b.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/c.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/b.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/c.xml": No such file or directory
|
||||
|
@ -1 +1 @@
|
||||
I/O warning : failed to load "test/XInclude/docs/c.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/c.xml": No such file or directory
|
||||
|
@ -1,16 +1,16 @@
|
||||
I/O warning : failed to load "test/XInclude/docs/a01.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a02.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a03.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a04.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a05.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a06.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a07.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a08.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a09.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a10.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a11.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a12.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a13.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a14.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a15.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/a16.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a01.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a02.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a03.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a04.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a05.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a06.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a07.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a08.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a09.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a10.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a11.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a12.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a13.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a14.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a15.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/a16.xml": No such file or directory
|
||||
|
@ -1,2 +1,2 @@
|
||||
I/O warning : failed to load "test/XInclude/docs/b.xml": No such file or directory
|
||||
I/O warning : failed to load "test/XInclude/docs/c.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/b.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/docs/c.xml": No such file or directory
|
||||
|
@ -1 +1 @@
|
||||
I/O warning : failed to load "test/XInclude/without-reader/404.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/without-reader/404.xml": No such file or directory
|
||||
|
@ -1 +1 @@
|
||||
I/O warning : failed to load "test/XInclude/without-reader/b.xml": No such file or directory
|
||||
I/O error : failed to load "test/XInclude/without-reader/b.xml": No such file or directory
|
||||
|
@ -1,4 +1,4 @@
|
||||
I/O warning : failed to load "test/schemas/import1_0bc.imp": No such file or directory
|
||||
I/O error : failed to load "test/schemas/import1_0bc.imp": No such file or directory
|
||||
./test/schemas/import1_0.xsd:11: element import: Schemas parser warning : Element '{http://www.w3.org/2001/XMLSchema}import': Failed to locate a schema at location 'test/schemas/import1_0bc.imp'. Skipping the import.
|
||||
./test/schemas/import1_0.xsd:16: element import: Schemas parser warning : Element '{http://www.w3.org/2001/XMLSchema}import': Skipping import of schema located at 'test/schemas/import1_0b.imp' for the namespace 'http://BAR', since this namespace was already imported with the schema located at 'test/schemas/import1_0.imp'.
|
||||
./test/schemas/import1_0.xsd:26: element element: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}element', attribute 'ref': The QName value '{http://BAR}bar.B' does not resolve to a(n) element declaration.
|
||||
|
Loading…
Reference in New Issue
Block a user