40408 (nsbeta2+) - Check for nsresult in nsFragmentContentSink::AddLeaf().

The HTMLTag array was,erroneously,going out-of-bounds for XMP tag.
r=rickg
30617 (nsbeta2+) - Misplaced AREA tag should be informed with base target info.
r=vidur.

content/html/document/src/nsHTMLContentSink.cpp

@@ -3364,6 +3364,8 @@ HTMLContentSink::ProcessAREATag(const nsIParserNode& aNode)
       return rv;
     }        
 
+    AddBaseTagInfo(area); // basehref or basetarget. Fix. Bug: 30617
+
     // Add AREA object to the current map
     mCurrentMap->AppendChildTo(area, PR_FALSE);
     NS_RELEASE(area);

content/html/document/src/nsHTMLFragmentContentSink.cpp

@@ -533,10 +533,10 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
         }
 
         nsCOMPtr<nsINodeInfo> nodeInfo;
-        result =
-          mNodeInfoManager->GetNodeInfo(tmpName, nsnull, kNameSpaceID_None,
+        result = mNodeInfoManager->GetNodeInfo(tmpName, nsnull, kNameSpaceID_None,
                                                *getter_AddRefs(nodeInfo));
 
+        if(NS_SUCCEEDED(result)) {
           result = NS_CreateHTMLElement(getter_AddRefs(content), nodeInfo);
 
           if (NS_OK == result) {
@@ -558,6 +558,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
           else if (nodeType == eHTMLTag_base)
               ProcessBaseTag(content);
         }
+      }
       break;
     case eToken_text:
     case eToken_whitespace:

layout/html/document/src/nsHTMLContentSink.cpp

@@ -3364,6 +3364,8 @@ HTMLContentSink::ProcessAREATag(const nsIParserNode& aNode)
       return rv;
     }        
 
+    AddBaseTagInfo(area); // basehref or basetarget. Fix. Bug: 30617
+
     // Add AREA object to the current map
     mCurrentMap->AppendChildTo(area, PR_FALSE);
     NS_RELEASE(area);

layout/html/document/src/nsHTMLFragmentContentSink.cpp

@@ -533,10 +533,10 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
         }
 
         nsCOMPtr<nsINodeInfo> nodeInfo;
-        result =
-          mNodeInfoManager->GetNodeInfo(tmpName, nsnull, kNameSpaceID_None,
+        result = mNodeInfoManager->GetNodeInfo(tmpName, nsnull, kNameSpaceID_None,
                                                *getter_AddRefs(nodeInfo));
 
+        if(NS_SUCCEEDED(result)) {
           result = NS_CreateHTMLElement(getter_AddRefs(content), nodeInfo);
 
           if (NS_OK == result) {
@@ -558,6 +558,7 @@ nsHTMLFragmentContentSink::AddLeaf(const nsIParserNode& aNode)
           else if (nodeType == eHTMLTag_base)
               ProcessBaseTag(content);
         }
+      }
       break;
     case eToken_text:
     case eToken_whitespace: