Roll libxml to 3169602058bd2d04913909e869c61d1540bc7fb4

third_party/libxml/src/xmlschemas.c

 /*
  * schemas.c : implementation of the XML Schema handling and
  *             schema validity checking
  *
  * See Copyright for the status of this software.
  *
  * Daniel Veillard <veillard@redhat.com>
  */
 
 /*
@@ skipping 3150 matching lines @@
                 FREE_AND_NULL(str);
             }
         } else {
             if (node->type == XML_ATTRIBUTE_NODE)
                 msg = xmlStrcat(msg, BAD_CAST "The value '%s' is not valid.");
             else
                 msg = xmlStrcat(msg, BAD_CAST "The character content is not "
                 "valid.");
         }
         if (expected) {
+            xmlChar *expectedEscaped = xmlCharStrdup(expected);
             msg = xmlStrcat(msg, BAD_CAST " Expected is '");
-            xmlChar *expectedEscaped = xmlCharStrdup(expected);
             msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
             FREE_AND_NULL(expectedEscaped);
             msg = xmlStrcat(msg, BAD_CAST "'.\n");
         } else
             msg = xmlStrcat(msg, BAD_CAST "\n");
         if (node->type == XML_ATTRIBUTE_NODE)
             xmlSchemaPErr(ctxt, node, error, (const char *) msg, value, NULL);
         else
             xmlSchemaPErr(ctxt, node, error, (const char *) msg, NULL, NULL);
     } else {
@@ skipping 24201 matching lines @@
                     namespaces[j+1];
             ielem->nbNsBindings++;
         }
     }
     /*
     * Register attributes.
     * SAX VAL TODO: We are not adding namespace declaration
     * attributes yet.
     */
     if (nb_attributes != 0) {
+        int valueLen, k, l;
         xmlChar *value;
 
         for (j = 0, i = 0; i < nb_attributes; i++, j += 5) {
             /*
             * Duplicate the value, changing any &#38; to a literal ampersand.
             *
             * libxml2 differs from normal SAX here in that it escapes all ampersands
             * as &#38; instead of delivering the raw converted string. Changing the
             * behavior at this point would break applications that use this API, so
-            * we are forced to work around it. There is no danger of accidentally
-            * decoding some entity other than &#38; in this step because without
-            * unescaped ampersands there can be no other entities in the string.
+            * we are forced to work around it.
             */
-            value = xmlStringLenDecodeEntities(vctxt->parserCtxt, attributes[j+3],
-                attributes[j+4] - attributes[j+3], XML_SUBSTITUTE_REF, 0, 0, 0);
+            valueLen = attributes[j+4] - attributes[j+3];
+            value = xmlMallocAtomic(valueLen + 1);
+            if (value == NULL) {
+                xmlSchemaVErrMemory(vctxt,
+                    "allocating string for decoded attribute",
+                    NULL);
+                goto internal_error;
+            }
+            for (k = 0, l = 0; k < valueLen; l++) {
+                if (k < valueLen - 4 &&
+                    attributes[j+3][k+0] == '&' &&
+                    attributes[j+3][k+1] == '#' &&
+                    attributes[j+3][k+2] == '3' &&
+                    attributes[j+3][k+3] == '8' &&
+                    attributes[j+3][k+4] == ';') {
+                    value[l] = '&';
+                    k += 5;
+                } else {
+                    value[l] = attributes[j+3][k];
+                    k++;
+                }
+            }
+            value[l] = '\0';
             /*
             * TODO: Set the node line.
             */
             ret = xmlSchemaValidatorPushAttribute(vctxt,
                 NULL, ielem->nodeLine, attributes[j], attributes[j+2], 0,
                 value, 1);
             if (ret == -1) {
                 VERROR_INT("xmlSchemaSAXHandleStartElementNs",
                     "calling xmlSchemaValidatorPushAttribute()");
                 goto internal_error;
@@ skipping 1499 matching lines @@
 xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt)
 {
     if (ctxt == NULL)
         return(NULL);
     return (ctxt->parserCtxt);
 }
 
 #define bottom_xmlschemas
 #include "elfgcchack.h"
 #endif /* LIBXML_SCHEMAS_ENABLED */