9728d7
diff -up firefox-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25236 firefox-91.7.0/parser/expat/lib/xmlparse.c
9728d7
--- firefox-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25236	2022-03-02 18:08:40.085642028 +0100
9728d7
+++ firefox-91.7.0/parser/expat/lib/xmlparse.c	2022-03-02 18:13:31.838667958 +0100
9728d7
@@ -700,8 +700,7 @@ XML_ParserCreate(const XML_Char *encodin
9728d7
 XML_Parser XMLCALL
9728d7
 XML_ParserCreateNS(const XML_Char *encodingName, XML_Char nsSep)
9728d7
 {
9728d7
-  XML_Char tmp[2];
9728d7
-  *tmp = nsSep;
9728d7
+  XML_Char tmp[2] = {nsSep, 0};
9728d7
   return XML_ParserCreate_MM(encodingName, NULL, tmp);
9728d7
 }
9728d7
 #endif
9728d7
@@ -1276,8 +1275,7 @@ XML_ExternalEntityParserCreate(XML_Parse
9728d7
      would be otherwise.
9728d7
   */
9728d7
   if (ns) {
9728d7
-    XML_Char tmp[2];
9728d7
-    *tmp = namespaceSeparator;
9728d7
+    XML_Char tmp[2] = {parser->m_namespaceSeparator, 0};
9728d7
     parser = parserCreate(encodingName, &parser->m_mem, tmp, newDtd);
9728d7
   }
9728d7
   else {
9728d7
@@ -3667,6 +3665,16 @@ addBinding(XML_Parser parser, PREFIX *pr
9728d7
     if (!mustBeXML && isXMLNS
9728d7
         && (len > xmlnsLen || uri[len] != xmlnsNamespace[len]))
9728d7
       isXMLNS = XML_FALSE;
9728d7
+    // NOTE: While Expat does not validate namespace URIs against RFC 3986,
9728d7
+    //       we have to at least make sure that the XML processor on top of
9728d7
+    //       Expat (that is splitting tag names by namespace separator into
9728d7
+    //       2- or 3-tuples (uri-local or uri-local-prefix)) cannot be confused
9728d7
+    //       by an attacker putting additional namespace separator characters
9728d7
+    //       into namespace declarations.  That would be ambiguous and not to
9728d7
+    //       be expected.
9728d7
+    if (parser->m_ns && (uri[len] == parser->m_namespaceSeparator)) {
9728d7
+      return XML_ERROR_SYNTAX;
9728d7
+    }
9728d7
   }
9728d7
   isXML = isXML && len == xmlLen;
9728d7
   isXMLNS = isXMLNS && len == xmlnsLen;