Make the XML entity recursion check more precise.

third_party/libxml/src/entities.c

 /*
  * entities.c : implementation for the XML entities handling
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
 #define IN_LIBXML
 #include "libxml.h"
@@ skipping 141 matching lines @@
     xmlEntityPtr ret;
 
     ret = (xmlEntityPtr) xmlMalloc(sizeof(xmlEntity));
     if (ret == NULL) {
         xmlEntitiesErrMemory("xmlCreateEntity: malloc failed");
         return(NULL);
     }
     memset(ret, 0, sizeof(xmlEntity));
     ret->type = XML_ENTITY_DECL;
     ret->checked = 0;
+    ret->guard = XML_ENTITY_NOT_BEING_CHECKED;
 
     /*
      * fill the structure.
      */
     ret->etype = (xmlEntityType) type;
     if (dict == NULL) {
         ret->name = xmlStrdup(name);
         if (ExternalID != NULL)
             ret->ExternalID = xmlStrdup(ExternalID);
         if (SystemID != NULL)
@@ skipping 752 matching lines @@
     if (ent->ExternalID != NULL)
         cur->ExternalID = xmlStrdup(ent->ExternalID);
     if (ent->SystemID != NULL)
         cur->SystemID = xmlStrdup(ent->SystemID);
     if (ent->content != NULL)
         cur->content = xmlStrdup(ent->content);
     if (ent->orig != NULL)
         cur->orig = xmlStrdup(ent->orig);
     if (ent->URI != NULL)
         cur->URI = xmlStrdup(ent->URI);
+    cur->guard = 0;
     return(cur);
 }
 
 /**
  * xmlCopyEntitiesTable:
  * @table:  An entity table
  *
  * Build a copy of an entity table.
  *
  * Returns the new xmlEntitiesTablePtr or NULL in case of error.
@@ skipping 152 matching lines @@
  *
  * This will dump the content of the entity table as an XML DTD definition
  */
 void
 xmlDumpEntitiesTable(xmlBufferPtr buf, xmlEntitiesTablePtr table) {
     xmlHashScan(table, (xmlHashScanner)xmlDumpEntityDeclScan, buf);
 }
 #endif /* LIBXML_OUTPUT_ENABLED */
 #define bottom_entities
 #include "elfgcchack.h"