diff options
| author | Aron Xu <aron@debian.org> | 2012-05-25 04:03:35 +0000 |
|---|---|---|
| committer | Aron Xu <aron@debian.org> | 2012-05-25 04:03:35 +0000 |
| commit | d7372d053bbd1d58216fbb04d1771ffa4cc3e624 (patch) | |
| tree | 62b661911406394bbeaca8951d660bb6d8aac0de /xmlschemas.c | |
| parent | 2d1849b271fa8697b88d07ba7d78dc83591e1363 (diff) | |
| download | libxml2-d7372d053bbd1d58216fbb04d1771ffa4cc3e624.tar.gz | |
Imported Upstream version 2.8.0+dfsg1upstream/2.8.0+dfsg1
Diffstat (limited to 'xmlschemas.c')
| -rw-r--r-- | xmlschemas.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmlschemas.c b/xmlschemas.c index 5de7ca5..2fb2151 100644 --- a/xmlschemas.c +++ b/xmlschemas.c @@ -13946,7 +13946,7 @@ xmlSchemaCheckCOSNSSubset(xmlSchemaWildcardPtr sub, */ if ((sub->negNsSet != NULL) && (super->negNsSet != NULL) && - (sub->negNsSet->value == sub->negNsSet->value)) + (sub->negNsSet->value == super->negNsSet->value)) return (0); /* * 3.1 sub must be a set whose members are either namespace names or �absent�. @@ -15156,9 +15156,10 @@ xmlSchemaCheckSTPropsCorrect(xmlSchemaParserCtxtPtr ctxt, FREE_AND_NULL(str) return (XML_SCHEMAP_ST_PROPS_CORRECT_1); } - if ( (WXS_IS_LIST(type) || WXS_IS_UNION(type)) && - (WXS_IS_RESTRICTION(type) == 0) && - (! WXS_IS_ANY_SIMPLE_TYPE(baseType))) { + if ((WXS_IS_LIST(type) || WXS_IS_UNION(type)) && + (WXS_IS_RESTRICTION(type) == 0) && + ((! WXS_IS_ANY_SIMPLE_TYPE(baseType)) && + (baseType->type != XML_SCHEMA_TYPE_SIMPLE))) { xmlSchemaPCustomErr(ctxt, XML_SCHEMAP_ST_PROPS_CORRECT_1, WXS_BASIC_CAST type, NULL, @@ -18475,8 +18476,8 @@ xmlSchemaFixupComplexType(xmlSchemaParserCtxtPtr pctxt, particle->children->children = (xmlSchemaTreeItemPtr) xmlSchemaAddParticle(pctxt, type->node, - ((xmlSchemaParticlePtr) type->subtypes)->minOccurs, - ((xmlSchemaParticlePtr) type->subtypes)->maxOccurs); + ((xmlSchemaParticlePtr) baseType->subtypes)->minOccurs, + ((xmlSchemaParticlePtr) baseType->subtypes)->maxOccurs); if (particle->children->children == NULL) goto exit_failure; particle = (xmlSchemaParticlePtr) |