Roll libxml to bdec2183f34b37ee89ae1d330c6ad2bb4d76605f

third_party/libxml/src/xmlsave.c

 /*
  * xmlsave.c: Implemetation of the document serializer
  *
  * See Copyright for the status of this software.
  *
  * daniel@veillard.com
  */
 
 #define IN_LIBXML
 #include "libxml.h"
@@ skipping 2079 matching lines @@
                 xmlBufAdd(buf, base, cur - base);
             xmlBufAdd(buf, BAD_CAST ">", 4);
             cur++;
             base = cur;
         } else if (*cur == '&') {
             if (base != cur)
                 xmlBufAdd(buf, base, cur - base);
             xmlBufAdd(buf, BAD_CAST "&", 5);
             cur++;
             base = cur;
-        } else if ((*cur >= 0x80) && ((doc == NULL) ||
-                                      (doc->encoding == NULL))) {
+        } else if ((*cur >= 0x80) && (cur[1] != 0) &&
+                   ((doc == NULL) || (doc->encoding == NULL))) {
             /*
              * We assume we have UTF-8 content.
              */
             unsigned char tmp[12];
             int val = 0, l = 1;
 
             if (base != cur)
                 xmlBufAdd(buf, base, cur - base);
             if (*cur < 0xC0) {
                 xmlSaveErr(XML_SAVE_NOT_UTF8, (xmlNodePtr) attr, NULL);
                 if (doc != NULL)
                     doc->encoding = xmlStrdup(BAD_CAST "ISO-8859-1");
                 xmlSerializeHexCharRef(tmp, *cur);
                 xmlBufAdd(buf, (xmlChar *) tmp, -1);
                 cur++;
                 base = cur;
                 continue;
             } else if (*cur < 0xE0) {
                 val = (cur[0]) & 0x1F;
                 val <<= 6;
                 val |= (cur[1]) & 0x3F;
                 l = 2;
-            } else if (*cur < 0xF0) {
+            } else if ((*cur < 0xF0) && (cur [2] != 0)) {
                 val = (cur[0]) & 0x0F;
                 val <<= 6;
                 val |= (cur[1]) & 0x3F;
                 val <<= 6;
                 val |= (cur[2]) & 0x3F;
                 l = 3;
-            } else if (*cur < 0xF8) {
+            } else if ((*cur < 0xF8) && (cur [2] != 0) && (cur[3] != 0)) {
                 val = (cur[0]) & 0x07;
                 val <<= 6;
                 val |= (cur[1]) & 0x3F;
                 val <<= 6;
                 val |= (cur[2]) & 0x3F;
                 val <<= 6;
                 val |= (cur[3]) & 0x3F;
                 l = 4;
             }
             if ((l == 1) || (!IS_CHAR(val))) {
@@ skipping 637 matching lines @@
  */
 int
 xmlSaveFile(const char *filename, xmlDocPtr cur) {
     return(xmlSaveFormatFileEnc(filename, cur, NULL, 0));
 }
 
 #endif /* LIBXML_OUTPUT_ENABLED */
 
 #define bottom_xmlsave
 #include "elfgcchack.h"