From f7f8d0f24eb4e75e9d8cee70b79df045d2652607 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Thu, 10 Jun 1999 05:33:47 +0000 Subject: [PATCH] added code to ignore unknown namespace prefix for attributes (actually the parser should've rejected it before here) git-svn-id: svn://10.0.0.236/trunk@34574 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xml/document/src/nsXMLContentSink.cpp | 8 ++++---- mozilla/layout/xml/document/src/nsXMLContentSink.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index ef49fa7507e..32d8e3af1b4 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -458,14 +458,14 @@ nsXMLContentSink::AddAttributes(const nsIParserNode& aNode, nsIAtom* nameSpacePrefix = CutNameSpacePrefix(name); nsIAtom* nameAtom = NS_NewAtom(name); PRInt32 nameSpaceID = (nsnull == nameSpacePrefix) ? kNameSpaceID_None : GetNameSpaceId(nameSpacePrefix); + if (kNameSpaceID_Unknown == nameSpaceID) { + nameSpaceID = kNameSpaceID_None; // XXX is this correct? or is it a bad document? + } if ((kNameSpaceID_XMLNS == nameSpaceID) && aIsHTML) { NS_RELEASE(nameAtom); name.Insert("xmlns:", 0); nameAtom = NS_NewAtom(name); - nameSpaceID = kNameSpaceID_HTML; - } - else if ((kNameSpaceID_None == nameSpaceID) && aIsHTML) { - nameSpaceID = kNameSpaceID_HTML; + nameSpaceID = kNameSpaceID_HTML; // XXX this is wrong, but necessary until HTML can store other namespaces for attrs } nsAutoString value; diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp index ef49fa7507e..32d8e3af1b4 100644 --- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp @@ -458,14 +458,14 @@ nsXMLContentSink::AddAttributes(const nsIParserNode& aNode, nsIAtom* nameSpacePrefix = CutNameSpacePrefix(name); nsIAtom* nameAtom = NS_NewAtom(name); PRInt32 nameSpaceID = (nsnull == nameSpacePrefix) ? kNameSpaceID_None : GetNameSpaceId(nameSpacePrefix); + if (kNameSpaceID_Unknown == nameSpaceID) { + nameSpaceID = kNameSpaceID_None; // XXX is this correct? or is it a bad document? + } if ((kNameSpaceID_XMLNS == nameSpaceID) && aIsHTML) { NS_RELEASE(nameAtom); name.Insert("xmlns:", 0); nameAtom = NS_NewAtom(name); - nameSpaceID = kNameSpaceID_HTML; - } - else if ((kNameSpaceID_None == nameSpaceID) && aIsHTML) { - nameSpaceID = kNameSpaceID_HTML; + nameSpaceID = kNameSpaceID_HTML; // XXX this is wrong, but necessary until HTML can store other namespaces for attrs } nsAutoString value;