diff --git a/mozilla/htmlparser/src/nsXIFDTD.cpp b/mozilla/htmlparser/src/nsXIFDTD.cpp
index 015ec2ae96b..f271e13c595 100644
--- a/mozilla/htmlparser/src/nsXIFDTD.cpp
+++ b/mozilla/htmlparser/src/nsXIFDTD.cpp
@@ -624,15 +624,18 @@ nsresult nsXIFDTD::HandleTextToken(CToken* aToken) {
 
 
 void nsXIFDTD::AddAttribute(nsIParserNode& aNode) {
-  nsString key;
-  nsString value;
-  PRBool   hasValue;
-
-  hasValue = GetAttributePair(aNode,key,value);
-  CAttributeToken* attribute = new CAttributeToken(key,value);
   nsIParserNode* top = PeekNode();
   if (top != nsnull)
+  {
+    nsString key;
+    nsString value;
+    PRBool   hasValue;
+
+    hasValue = GetAttributePair(aNode,key,value);
+    // XXX should we still be calling AddAttribute if hasValue is false?
+    CAttributeToken* attribute = new CAttributeToken(key,value);
     ((nsCParserNode*)top)->AddAttribute(attribute);
+  }
 }
 
 
diff --git a/mozilla/parser/htmlparser/src/nsXIFDTD.cpp b/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
index 015ec2ae96b..f271e13c595 100644
--- a/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
+++ b/mozilla/parser/htmlparser/src/nsXIFDTD.cpp
@@ -624,15 +624,18 @@ nsresult nsXIFDTD::HandleTextToken(CToken* aToken) {
 
 
 void nsXIFDTD::AddAttribute(nsIParserNode& aNode) {
-  nsString key;
-  nsString value;
-  PRBool   hasValue;
-
-  hasValue = GetAttributePair(aNode,key,value);
-  CAttributeToken* attribute = new CAttributeToken(key,value);
   nsIParserNode* top = PeekNode();
   if (top != nsnull)
+  {
+    nsString key;
+    nsString value;
+    PRBool   hasValue;
+
+    hasValue = GetAttributePair(aNode,key,value);
+    // XXX should we still be calling AddAttribute if hasValue is false?
+    CAttributeToken* attribute = new CAttributeToken(key,value);
     ((nsCParserNode*)top)->AddAttribute(attribute);
+  }
 }