Merge 116175 - Pull entity fix from upstream.

third_party/libxml/src/parser.c

 /*
  * parser.c : an XML 1.0 parser, namespaces and validity support are mostly
  *            implemented on top of the SAX interfaces
  *
  * References:
  *   The XML specification:
  *     http://www.w3.org/TR/REC-xml
  *   Original 1.0 version:
  *     http://www.w3.org/TR/1998/REC-xml-19980210
  *   XML second edition working draft
@@ skipping 2569 matching lines @@
                     }
                     xmlFree(rep);
                     rep = NULL;
                 }
             } else if (ent != NULL) {
                 int i = xmlStrlen(ent->name);
                 const xmlChar *cur = ent->name;
 
                 buffer[nbchars++] = '&';
                 if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
-                    growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
+                    growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
                 }
                 for (;i > 0;i--)
                     buffer[nbchars++] = *cur++;
                 buffer[nbchars++] = ';';
             }
         } else if (c == '%' && (what & XML_SUBSTITUTE_PEREF)) {
             if (xmlParserDebugEntities)
                 xmlGenericError(xmlGenericErrorContext,
                         "String decoding PE Reference: %.30s\n", str);
             ent = xmlParseStringPEReference(ctxt, &str);
@@ skipping 12257 matching lines @@
     if (stream == NULL) {
         xmlFreeParserInputBuffer(input);
         return (NULL);
     }
     inputPush(ctxt, stream);
     return (xmlDoRead(ctxt, URL, encoding, options, 1));
 }
 
 #define bottom_parser
 #include "elfgcchack.h"