Roll libxml to 2.9.3

third_party/libxml/src/parserInternals.c

 /*
  * parserInternals.c : Internal routines (and obsolete ones) needed for the
  *                     XML and HTML parsers.
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
 #define IN_LIBXML
@@ skipping 919 matching lines @@
  * change the input functions when discovering the character encoding
  * of a given entity.
  *
  * Returns 0 in case of success, -1 otherwise
  */
 int
 xmlSwitchEncoding(xmlParserCtxtPtr ctxt, xmlCharEncoding enc)
 {
     xmlCharEncodingHandlerPtr handler;
     int len = -1;
+    int ret;
 
     if (ctxt == NULL) return(-1);
     switch (enc) {
         case XML_CHAR_ENCODING_ERROR:
             __xmlErrEncoding(ctxt, XML_ERR_UNKNOWN_ENCODING,
                            "encoding unknown\n", NULL, NULL);
             return(-1);
         case XML_CHAR_ENCODING_NONE:
             /* let's assume it's UTF-8 without the XML decl */
             ctxt->charset = XML_CHAR_ENCODING_UTF8;
@@ skipping 140 matching lines @@
                                "encoding not supported %s\n",
                                BAD_CAST "EUC-JP", NULL);
                 break;
             default:
                 break;
         }
     }
     if (handler == NULL)
         return(-1);
     ctxt->charset = XML_CHAR_ENCODING_UTF8;
-    return(xmlSwitchToEncodingInt(ctxt, handler, len));
+    ret = xmlSwitchToEncodingInt(ctxt, handler, len);
+    if ((ret < 0) || (ctxt->errNo == XML_I18N_CONV_FAILED)) {
+        /*
+         * on encoding conversion errors, stop the parser
+         */
+        xmlStopParser(ctxt);
+        ctxt->errNo = XML_I18N_CONV_FAILED;
+    }
+    return(ret);
 }
 
 /**
  * xmlSwitchInputEncoding:
  * @ctxt:  the parser context
  * @input:  the input stream
  * @handler:  the encoding handler
  * @len:  the number of bytes to convert for the first line or -1
  *
  * change the input functions when discovering the character encoding
@@ skipping 332 matching lines @@
         }
         return(NULL);
     }
     input = xmlNewInputStream(ctxt);
     if (input == NULL) {
         return(NULL);
     }
     if (entity->URI != NULL)
         input->filename = (char *) xmlStrdup((xmlChar *) entity->URI);
     input->base = entity->content;
+    if (entity->length == 0)
+        entity->length = xmlStrlen(entity->content);
     input->cur = entity->content;
     input->length = entity->length;
     input->end = &entity->content[input->length];
     return(input);
 }
 
 /**
  * xmlNewStringInputStream:
  * @ctxt:  an XML parser context
  * @buffer:  an memory buffer
@@ skipping 668 matching lines @@
 xmlKeepBlanksDefault(int val) {
     int old = xmlKeepBlanksDefaultValue;
 
     xmlKeepBlanksDefaultValue = val;
     if (!val) xmlIndentTreeOutput = 1;
     return(old);
 }
 
 #define bottom_parserInternals
 #include "elfgcchack.h"