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

Fixed a side-effect of the previous XSI bugfix: The constructor needs a

Browse Source 
* xmlschemas.c: Fixed a side-effect of the previous XSI bugfix:
  The constructor needs a bucket to be assigned during component
  fixup.
This commit is contained in:
Kasimier T. Buchcik
2006-02-20 14:47:08 +00:00
parent 1869be5690
commit 4c0aa16e43
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Mon Feb 20 15:45:19 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
* xmlschemas.c: Fixed a side-effect of the previous XSI bugfix:
The constructor needs a bucket to be assigned during component
fixup.
Mon Feb 20 14:32:36 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net> Mon Feb 20 14:32:36 CET 2006 Kasimier Buchcik <libxml2-cvs@cazic.net>
* xmlschemas.c xmlschemastypes.c: Fixed xs:boolean to reject * xmlschemas.c xmlschemastypes.c: Fixed xs:boolean to reject

39
xmlschemas.c
View File

@@ -5457,11 +5457,11 @@ xmlSchemaAddModelGroup(xmlSchemaParserCtxtPtr ctxt,
* Returns the new struture or NULL in case of error * Returns the new struture or NULL in case of error
*/ */
static xmlSchemaParticlePtr static xmlSchemaParticlePtr
xmlSchemaAddParticle(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema, xmlSchemaAddParticle(xmlSchemaParserCtxtPtr ctxt,
xmlNodePtr node, int min, int max) xmlNodePtr node, int min, int max)
{ {
xmlSchemaParticlePtr ret = NULL; xmlSchemaParticlePtr ret = NULL;
if ((ctxt == NULL) || (schema == NULL)) if (ctxt == NULL)
return (NULL); return (NULL);
#ifdef DEBUG #ifdef DEBUG
@@ -6914,7 +6914,7 @@ xmlSchemaParseAny(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
/* /*
* Create the particle. * Create the particle.
*/ */
particle = xmlSchemaAddParticle(ctxt, schema, node, min, max); particle = xmlSchemaAddParticle(ctxt, node, min, max);
if (particle == NULL) if (particle == NULL)
return (NULL); return (NULL);
particle->annot = annot; particle->annot = annot;
@@ -8461,7 +8461,7 @@ xmlSchemaParseElement(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
min = xmlGetMinOccurs(ctxt, node, 0, -1, 1, "xs:nonNegativeInteger"); min = xmlGetMinOccurs(ctxt, node, 0, -1, 1, "xs:nonNegativeInteger");
max = xmlGetMaxOccurs(ctxt, node, 0, UNBOUNDED, 1, "(xs:nonNegativeInteger | unbounded)"); max = xmlGetMaxOccurs(ctxt, node, 0, UNBOUNDED, 1, "(xs:nonNegativeInteger | unbounded)");
xmlSchemaPCheckParticleCorrect_2(ctxt, NULL, node, min, max); xmlSchemaPCheckParticleCorrect_2(ctxt, NULL, node, min, max);
particle = xmlSchemaAddParticle(ctxt, schema, node, min, max); particle = xmlSchemaAddParticle(ctxt, node, min, max);
if (particle == NULL) if (particle == NULL)
goto return_null; goto return_null;
@@ -9347,7 +9347,7 @@ xmlSchemaParseModelGroupDefRef(xmlSchemaParserCtxtPtr ctxt,
attr = attr->next; attr = attr->next;
} }
xmlSchemaPValAttrID(ctxt, node, BAD_CAST "id"); xmlSchemaPValAttrID(ctxt, node, BAD_CAST "id");
item = xmlSchemaAddParticle(ctxt, schema, node, min, max); item = xmlSchemaAddParticle(ctxt, node, min, max);
if (item == NULL) if (item == NULL)
return (NULL); return (NULL);
/* /*
@@ -11181,7 +11181,7 @@ xmlSchemaParseModelGroup(xmlSchemaParserCtxtPtr ctxt, xmlSchemaPtr schema,
/* /*
* Create a particle * Create a particle
*/ */
particle = xmlSchemaAddParticle(ctxt, schema, node, min, max); particle = xmlSchemaAddParticle(ctxt, node, min, max);
if (particle == NULL) if (particle == NULL)
return (NULL); return (NULL);
particle->children = (xmlSchemaTreeItemPtr) item; particle->children = (xmlSchemaTreeItemPtr) item;
@@ -18216,7 +18216,7 @@ xmlSchemaFixupComplexType(xmlSchemaParserCtxtPtr pctxt,
/* /*
* Create the particle. * Create the particle.
*/ */
particle = xmlSchemaAddParticle(pctxt, pctxt->schema, particle = xmlSchemaAddParticle(pctxt,
type->node, 1, 1); type->node, 1, 1);
if (particle == NULL) if (particle == NULL)
goto exit_failure; goto exit_failure;
@@ -18333,7 +18333,7 @@ xmlSchemaFixupComplexType(xmlSchemaParserCtxtPtr pctxt,
/* /*
* Create the particle. * Create the particle.
*/ */
particle = xmlSchemaAddParticle(pctxt, pctxt->schema, particle = xmlSchemaAddParticle(pctxt,
type->node, 1, 1); type->node, 1, 1);
if (particle == NULL) if (particle == NULL)
goto exit_failure; goto exit_failure;
@@ -18354,7 +18354,7 @@ xmlSchemaFixupComplexType(xmlSchemaParserCtxtPtr pctxt,
*/ */
particle->children->children = particle->children->children =
(xmlSchemaTreeItemPtr) xmlSchemaAddParticle(pctxt, (xmlSchemaTreeItemPtr) xmlSchemaAddParticle(pctxt,
pctxt->schema, type->node, type->node,
((xmlSchemaParticlePtr) type->subtypes)->minOccurs, ((xmlSchemaParticlePtr) type->subtypes)->minOccurs,
((xmlSchemaParticlePtr) type->subtypes)->maxOccurs); ((xmlSchemaParticlePtr) type->subtypes)->maxOccurs);
if (particle->children->children == NULL) if (particle->children->children == NULL)
@@ -20556,6 +20556,7 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
xmlSchemaConstructionCtxtPtr con = pctxt->constructor; xmlSchemaConstructionCtxtPtr con = pctxt->constructor;
xmlSchemaTreeItemPtr item, *items; xmlSchemaTreeItemPtr item, *items;
int nbItems, i, ret = 0; int nbItems, i, ret = 0;
xmlSchemaBucketPtr oldbucket = con->bucket;
#define FIXHFAILURE if (pctxt->err == XML_SCHEMAP_INTERNAL) goto exit_failure; #define FIXHFAILURE if (pctxt->err == XML_SCHEMAP_INTERNAL) goto exit_failure;
@@ -20563,6 +20564,16 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
(con->pending->nbItems == 0)) (con->pending->nbItems == 0))
return(0); return(0);
/*
* Since xmlSchemaFixupComplexType() will create new particles
* (local components), and those particle components need a bucket
* on the constructor, we'll assure here that the constructor has
* a bucket.
* TODO: Think about storing locals _only_ on the main bucket.
*/
if (con->bucket == NULL)
con->bucket = rootBucket;
/* TODO: /* TODO:
* SPEC (src-redefine): * SPEC (src-redefine):
* (6.2) "If it has no such self-reference, then all of the * (6.2) "If it has no such self-reference, then all of the
@@ -20578,7 +20589,7 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
/* /*
* Add global components to the schemata's hash tables. * Add global components to the schemata's hash tables.
*/ */
xmlSchemaAddComponents(pctxt, rootBucket); xmlSchemaAddComponents(pctxt, rootBucket);
pctxt->ctxtType = NULL; pctxt->ctxtType = NULL;
@@ -20961,6 +20972,7 @@ xmlSchemaFixupComponents(xmlSchemaParserCtxtPtr pctxt,
exit_error: exit_error:
ret = pctxt->err; ret = pctxt->err;
goto exit;
exit_failure: exit_failure:
ret = -1; ret = -1;
@@ -20971,12 +20983,13 @@ exit:
* those items will be processed over and over again for every XSI * those items will be processed over and over again for every XSI
* if not cleared here. * if not cleared here.
*/ */
con->pending->nbItems = 0; con->bucket = oldbucket;
con->pending->nbItems = 0;
if (con->substGroups != NULL) { if (con->substGroups != NULL) {
xmlHashFree(con->substGroups, xmlHashFree(con->substGroups,
(xmlHashDeallocator) xmlSchemaSubstGroupFree); (xmlHashDeallocator) xmlSchemaSubstGroupFree);
con->substGroups = NULL; con->substGroups = NULL;
} }
if (con->redefs != NULL) { if (con->redefs != NULL) {
xmlSchemaRedefListFree(con->redefs); xmlSchemaRedefListFree(con->redefs);
con->redefs = NULL; con->redefs = NULL;
@@ -21365,7 +21378,7 @@ xmlSchemaAssembleByLocation(xmlSchemaValidCtxtPtr vctxt,
/* Paranoid error channelling. */ /* Paranoid error channelling. */
if ((ret == 0) && (pctxt->nberrors != 0)) if ((ret == 0) && (pctxt->nberrors != 0))
ret = pctxt->err; ret = pctxt->err;
if (pctxt->nberrors == 0) { if (pctxt->nberrors == 0) {
/* /*
* Only bother to fixup pending components, if there was * Only bother to fixup pending components, if there was
* no error yet. * no error yet.