Roll libxml to 2.9.3

third_party/libxml/src/xmlreader.c

 /*
  * xmlreader.c: implements the xmlTextReader streaming node API
  *
  * NOTE:
  *   XmlTextReader.Normalization Property won't be supported, since
  *     it makes the parser non compliant to the XML recommendation
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
@@ skipping 2073 matching lines @@
     ret->entMax = 0;
     ret->entNr = 0;
     ret->input = input;
     ret->buffer = xmlBufCreateSize(100);
     if (ret->buffer == NULL) {
         xmlFree(ret);
         xmlGenericError(xmlGenericErrorContext,
                 "xmlNewTextReader : malloc failed\n");
         return(NULL);
     }
+    /* no operation on a reader should require a huge buffer */
+    xmlBufSetAllocationScheme(ret->buffer,
+                              XML_BUFFER_ALLOC_BOUNDED);
     ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
     if (ret->sax == NULL) {
         xmlBufFree(ret->buffer);
         xmlFree(ret);
         xmlGenericError(xmlGenericErrorContext,
                 "xmlNewTextReader : malloc failed\n");
         return(NULL);
     }
     xmlSAXVersion(ret->sax, 2);
     ret->startElement = ret->sax->startElement;
@@ skipping 1505 matching lines @@
     if (reader->curnode != NULL)
         node = reader->curnode;
     else
         node = reader->node;
 
     switch (node->type) {
         case XML_NAMESPACE_DECL:
             return(((xmlNsPtr) node)->href);
         case XML_ATTRIBUTE_NODE:{
             xmlAttrPtr attr = (xmlAttrPtr) node;
+            const xmlChar *ret;
 
             if ((attr->children != NULL) &&
                 (attr->children->type == XML_TEXT_NODE) &&
                 (attr->children->next == NULL))
                 return(attr->children->content);
             else {
                 if (reader->buffer == NULL) {
                     reader->buffer = xmlBufCreateSize(100);
                     if (reader->buffer == NULL) {
                         xmlGenericError(xmlGenericErrorContext,
                                         "xmlTextReaderSetup : malloc failed\n");
                         return (NULL);
                     }
+                    xmlBufSetAllocationScheme(reader->buffer,
+                                              XML_BUFFER_ALLOC_BOUNDED);
                 } else
                     xmlBufEmpty(reader->buffer);
                 xmlBufGetNodeContent(reader->buffer, node);
-                return(xmlBufContent(reader->buffer));
+                ret = xmlBufContent(reader->buffer);
+                if (ret == NULL) {
+                    /* error on the buffer best to reallocate */
+                    xmlBufFree(reader->buffer);
+                    reader->buffer = xmlBufCreateSize(100);
+                    xmlBufSetAllocationScheme(reader->buffer,
+                                              XML_BUFFER_ALLOC_BOUNDED);
+                    ret = BAD_CAST "";
+                }
+                return(ret);
             }
             break;
         }
         case XML_TEXT_NODE:
         case XML_CDATA_SECTION_NODE:
         case XML_PI_NODE:
         case XML_COMMENT_NODE:
             return(node->content);
         default:
             break;
@@ skipping 1478 matching lines @@
         reader->input = input;
         reader->allocs |= XML_TEXTREADER_INPUT;
     }
     if (reader->buffer == NULL)
         reader->buffer = xmlBufCreateSize(100);
     if (reader->buffer == NULL) {
         xmlGenericError(xmlGenericErrorContext,
                         "xmlTextReaderSetup : malloc failed\n");
         return (-1);
     }
+    /* no operation on a reader should require a huge buffer */
+    xmlBufSetAllocationScheme(reader->buffer,
+                              XML_BUFFER_ALLOC_BOUNDED);
     if (reader->sax == NULL)
         reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler));
     if (reader->sax == NULL) {
         xmlGenericError(xmlGenericErrorContext,
                         "xmlTextReaderSetup : malloc failed\n");
         return (-1);
     }
     xmlSAXVersion(reader->sax, 2);
     reader->startElement = reader->sax->startElement;
     reader->sax->startElement = xmlTextReaderStartElement;
@@ skipping 779 matching lines @@
     printf("ret: %d, cons: %ld , prod: %ld, output: '%s'\n", ret, cons,
            prod, output3);
     return (0);
 
 }
 #endif
 #endif /* NOT_USED_YET */
 #define bottom_xmlreader
 #include "elfgcchack.h"
 #endif /* LIBXML_READER_ENABLED */