Fixed null deref in nsXULAttribute::GetQualifiedName() -- handle the default namespace case.

This commit is contained in:
waterson%netscape.com 1999-04-17 00:29:54 +00:00
parent 248c61e86a
commit 4b759d3db0
2 changed files with 10 additions and 2 deletions

View File

@ -326,8 +326,12 @@ nsXULAttribute::GetQualifiedName(nsString& aQualifiedName)
aQualifiedName.Truncate();
if ((mNameSpaceID != kNameSpaceID_None) &&
(mNameSpaceID != kNameSpaceID_Unknown)) {
nsresult rv;
nsIAtom* prefix;
if (NS_SUCCEEDED(mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix))) {
rv = mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix);
if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
aQualifiedName.Append(prefix->GetUnicode());
aQualifiedName.Append(':');
NS_RELEASE(prefix);

View File

@ -326,8 +326,12 @@ nsXULAttribute::GetQualifiedName(nsString& aQualifiedName)
aQualifiedName.Truncate();
if ((mNameSpaceID != kNameSpaceID_None) &&
(mNameSpaceID != kNameSpaceID_Unknown)) {
nsresult rv;
nsIAtom* prefix;
if (NS_SUCCEEDED(mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix))) {
rv = mContent->GetNameSpacePrefixFromId(mNameSpaceID, prefix);
if (NS_SUCCEEDED(rv) && (prefix != nsnull)) {
aQualifiedName.Append(prefix->GetUnicode());
aQualifiedName.Append(':');
NS_RELEASE(prefix);