lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

Fixed bug #347316, reported by David Belius: The simple type, which was

Browse Source 
* xmlschemas.c: Fixed bug #347316, reported by David Belius:
  The simple type, which was the content type definition
  of a complex type, which in turn was the base type of a
  extending complex type, was missed to be set on this
  extending complex type in the derivation machinery.
This commit is contained in:
Kasimier T. Buchcik
2006-07-12 15:18:08 +00:00
parent 889b76229b
commit f896d44aac
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Wed Jul 12 17:13:03 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
* xmlschemas.c: Fixed bug #347316, reported by David Belius:
The simple type, which was the content type definition
of a complex type, which in turn was the base type of a
extending complex type, was missed to be set on this
extending complex type in the derivation machinery.
Mon Jul 3 13:36:43 CEST 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
* xpath.c: Changed xmlXPathCollectAndTest() to use

8
xmlschemas.c
View File

@@ -18287,10 +18287,18 @@ xmlSchemaFixupComplexType(xmlSchemaParserCtxtPtr pctxt,
if (type->contentType == XML_SCHEMA_CONTENT_EMPTY) {
/*
* SPEC (3.2.1)
* "If the <20>effective content<6E> is empty, then the
* {content type} of the [...] base ..."
*/
type->contentType = baseType->contentType;
type->subtypes = baseType->subtypes;
/*
* Fixes bug #347316:
* This is the case when the base type has a simple
* type definition as content.
*/
type->contentTypeDef = baseType->contentTypeDef;
/*
* NOTE that the effective mixed is ignored here.
*/
} else if (baseType->contentType == XML_SCHEMA_CONTENT_EMPTY) {