Roll libxml to 8effcb578e0590cc01bbcab0f9dccefc6bdbcdbd

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 599 matching lines @@
     int size;
 
     /*
      * Used to build complex element content models
      */
     xmlAutomataPtr am;
     xmlAutomataStatePtr start;
     xmlAutomataStatePtr end;
     xmlAutomataStatePtr state;
 
-    xmlDictPtr dict;            /* dictionnary for interned string names */
+    xmlDictPtr dict;            /* dictionary for interned string names */
     xmlSchemaTypePtr ctxtType; /* The current context simple/complex type */
     int options;
     xmlSchemaValidCtxtPtr vctxt;
     int isS4S;
     int isRedefine;
     int xsiAssemble;
     int stop; /* If the parser should stop; i.e. a critical error. */
     const xmlChar *targetNamespace;
     xmlSchemaBucketPtr redefined; /* The schema to be redefined. */
 
@@ skipping 26744 matching lines @@
     /*
     * Register attributes.
     * SAX VAL TODO: We are not adding namespace declaration
     * attributes yet.
     */
     if (nb_attributes != 0) {
         xmlChar *value;
 
         for (j = 0, i = 0; i < nb_attributes; i++, j += 5) {
             /*
-            * Duplicate the value.
+            * 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.
             */
-            value = xmlStrndup(attributes[j+3],
-                attributes[j+4] - attributes[j+3]);
+            value = xmlStringLenDecodeEntities(vctxt->parserCtxt, attributes[j+3],
+                attributes[j+4] - attributes[j+3], XML_SUBSTITUTE_REF, 0, 0, 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 */