c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

582906 XSD validating multiple imports of the same schema

Browse Source 
* xmlschemas.c: When validating a schema that includes the same file
  that has no targetNamespace defined an internal erro was thrown,
  depending on the orig namespace that should be allowed though
* test/schemas/582906-* result/schemas/582906-*: 2 tests case, one
  where this is allowed, and one where this is forbidden
This commit is contained in:
Jason Childs 2009-08-07 20:29:33 +02:00 committed by Daniel Veillard
parent d996072077
commit edc68aadf8
17 changed files with 140 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
result/schemas/582906-1_0_0 Normal file
View File

@ -0,0 +1 @@
./test/schemas/582906-1_0.xml validates

0
result/schemas/582906-1_0_0.err Normal file
View File

0
result/schemas/582906-2_0_0 Normal file
View File

1
result/schemas/582906-2_0_0.err Normal file
View File

@ -0,0 +1 @@
test/schemas/582906-2-prog1.xsd:9: element include: Schemas parser error : Element '{http://www.w3.org/2001/XMLSchema}include': The target namespace 'http://example.com/xml/Prog3' of the included/redefined schema 'test/schemas/582906-2-common.xsd' differs from 'http://example.com/xml/Prog1' of the including/redefining schema.

6
test/schemas/582906-1-common.xsd Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
</xs:schema>

11
test/schemas/582906-1-prog1.xsd Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns="http://example.com/xml/Prog1"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Prog1">
<xs:include schemaLocation="582906-1-common.xsd"/>
</xs:schema>

9
test/schemas/582906-1-prog2-include.xsd Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" attributeFormDefault="unqualified"
xml:lang="en">
<xs:include schemaLocation="582906-1-common.xsd"/>
</xs:schema>

13
test/schemas/582906-1-prog2.xsd Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns="http://example.com/xml/Prog2"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Prog2">
<xs:include schemaLocation="582906-1-common.xsd"/>
<xs:include schemaLocation="582906-1-prog2-include.xsd"/>
</xs:schema>

5
test/schemas/582906-1_0.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CollectedOutput xmlns="http://example.com/xml/Aggregator"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://example.com/xml/Aggregator
582906-1.xsd">5.3</CollectedOutput>

20
test/schemas/582906-1_0.xsd Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns="http://example.com/xml/Aggregator"
xmlns:prog1="http://example.com/xml/Prog1"
xmlns:prog2="http://example.com/xml/Prog2"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Aggregator">
<xs:import schemaLocation="582906-1-prog1.xsd"
namespace="http://example.com/xml/Prog1" />
<xs:import schemaLocation="582906-1-prog2.xsd"
namespace="http://example.com/xml/Prog2"
/>
<xs:element name="CollectedOutput" type="xs:float"/>
</xs:schema>

7
test/schemas/582906-2-common.xsd Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Prog3">
</xs:schema>

11
test/schemas/582906-2-prog1.xsd Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns="http://example.com/xml/Prog1"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Prog1">
<xs:include schemaLocation="582906-2-common.xsd"/>
</xs:schema>

9
test/schemas/582906-2-prog2-include.xsd Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" attributeFormDefault="unqualified"
xml:lang="en">
<xs:include schemaLocation="582906-2-common.xsd"/>
</xs:schema>

13
test/schemas/582906-2-prog2.xsd Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns="http://example.com/xml/Prog2"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Prog2">
<xs:include schemaLocation="582906-2-common.xsd"/>
<xs:include schemaLocation="582906-2-prog2-include.xsd"/>
</xs:schema>

5
test/schemas/582906-2_0.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<CollectedOutput xmlns="http://example.com/xml/Aggregator"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://example.com/xml/Aggregator
582906-2-0.xsd">5.3</CollectedOutput>

20
test/schemas/582906-2_0.xsd Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
<xs:schema xmlns="http://example.com/xml/Aggregator"
xmlns:prog1="http://example.com/xml/Prog1"
xmlns:prog2="http://example.com/xml/Prog2"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
targetNamespace="http://example.com/xml/Aggregator">
<xs:import schemaLocation="582906-2-prog1.xsd"
namespace="http://example.com/xml/Prog1" />
<xs:import schemaLocation="582906-2-prog2.xsd"
namespace="http://example.com/xml/Prog2"
/>
<xs:element name="CollectedOutput" type="xs:float"/>
</xs:schema>

17
xmlschemas.c
View File

@ -11039,14 +11039,15 @@ xmlSchemaParseIncludeOrRedefine(xmlSchemaParserCtxtPtr pctxt,
*/
isChameleon = 1;
if (bucket->parsed &&
(bucket->targetNamespace != pctxt->targetNamespace)) {
/*
* This is a sanity check, I dunno yet if this can happen.
*/
PERROR_INT("xmlSchemaParseIncludeOrRedefine",
"trying to use an already parsed schema for a "
"different targetNamespace");
return(-1);
bucket->origTargetNamespace != NULL) {
xmlSchemaCustomErr(ACTXT_CAST pctxt,
XML_SCHEMAP_SRC_INCLUDE,
node, NULL,
"The target namespace of the included/redefined schema "
"'%s' has to be absent or the same as the "
"including/redefining schema's target namespace",
schemaLocation, NULL);
goto exit_error;
}
bucket->targetNamespace = pctxt->targetNamespace;
}