Changeset 104197 in vbox

Timestamp:

Apr 5, 2024 3:19:01 PM (8 months ago)

Author:

vboxsync

Message:

libxml2-2.12.6: manual merge fix. ​bugref:10640

File:

• trunk/src/libs/libxml2-2.12.6/xmlschemas.c (modified) (3 diffs)

trunk/src/libs/libxml2-2.12.6/xmlschemas.c

@@ -5461 +5461 @@
                      xmlNodePtr node, int min, int max)
 {
+
     xmlSchemaParticlePtr ret = NULL;
     if (ctxt == NULL)
@@ -5466 +5467 @@
 
     ret = (xmlSchemaParticlePtr)
+
 #ifdef DEBUG
 #ifndef VBOX
@@ -5471 +5473 @@
 #endif /* !VBOX */
 #endif
-    ret = (xmlSchemaParticlePtr)
-        xmlMalloc(sizeof(xmlSchemaParticle));
-    if (ret == NULL) {
-        xmlSchemaPErrMemory(ctxt, "allocating particle component",
-            NULL);
-        return (NULL);
-    }
-    ret->type = XML_SCHEMA_TYPE_PARTICLE;
-    ret->annot = NULL;
-    ret->node = node;
-    ret->minOccurs = min;
-    ret->maxOccurs = max;
-    ret->next = NULL;
-    ret->children = NULL;
-
-    WXS_ADD_LOCAL(ctxt, ret);
-    /*
-    * Note that addition to pending components will be done locally
-    * to the specific parsing function, since the most particles
-    * need not to be fixed up (i.e. the reference to be resolved).
-    * REMOVED: WXS_ADD_PENDING(ctxt, ret);
-    */
-    return (ret);
 }