From 4b759d3db0b8c6eb6a44b8d4363a12cfacf895f6 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com" <waterson%netscape.com>
Date: Sat, 17 Apr 1999 00:29:54 +0000
Subject: [PATCH] Fixed null deref in nsXULAttribute::GetQualifiedName() --
 handle the default namespace case.

---
 content/xul/content/src/nsXULAttributes.cpp | 6 +++++-
 rdf/content/src/nsXULAttributes.cpp         | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/content/xul/content/src/nsXULAttributes.cpp b/content/xul/content/src/nsXULAttributes.cpp
index 5dfa02a14c58..f93887d48b09 100644
--- a/content/xul/content/src/nsXULAttributes.cpp
+++ b/content/xul/content/src/nsXULAttributes.cpp
@@ -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);
diff --git a/rdf/content/src/nsXULAttributes.cpp b/rdf/content/src/nsXULAttributes.cpp
index 5dfa02a14c58..f93887d48b09 100644
--- a/rdf/content/src/nsXULAttributes.cpp
+++ b/rdf/content/src/nsXULAttributes.cpp
@@ -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);