corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better fix for bug 47852 (NAMESPACE_ERR not being thrown when setting Node.prefix). r/sr=sicking.

Browse Source
This commit is contained in:
peterv@propagandism.org
2006-04-17 17:13:11 +00:00
parent 02c89c0b77
commit ed4e6a7cae
5 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
content/base/src/nsGenericElement.cpp
View File

@@ -1063,24 +1063,10 @@ nsGenericElement::SetPrefix(const nsAString& aPrefix)
if (!aPrefix.IsEmpty()) {
prefix = do_GetAtom(aPrefix);
NS_ENSURE_TRUE(prefix, NS_ERROR_OUT_OF_MEMORY);
// If the namespace of the element is null then setting a non-null prefix
// isn't allowed.
if (mNodeInfo->NamespaceID() == kNameSpaceID_None) {
return NS_ERROR_DOM_NAMESPACE_ERR;
}
}
// If the namespace of the element is the XML namespace then setting a prefix
// other than xml isn't allowed, if the namespace of the element is not the
// XML namespace then setting the prefix to xml isn't allowed.
// If the namespace of the element is the XMLNS namespace then setting a
// prefix other than xmlns isn't allowed, if the namespace of the element is
// not the XMLNS namespace then setting the prefix to xmlns isn't allowed.
if (((mNodeInfo->NamespaceID() == kNameSpaceID_XML) !=
(prefix == nsGkAtoms::xml)) ||
((mNodeInfo->NamespaceID() == kNameSpaceID_XMLNS) !=
(prefix == nsGkAtoms::xmlns))) {
if (!nsContentUtils::IsValidNodeName(mNodeInfo->NameAtom(), prefix,
mNodeInfo->NamespaceID())) {
return NS_ERROR_DOM_NAMESPACE_ERR;
}