Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't leave garbage on the namespace stack in failure cases. Bug 230360,

Browse Source 
r=sicking, sr=jst


git-svn-id: svn://10.0.0.236/trunk@151147 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-01-10 21:43:32 +00:00
parent 28fce9ad2f
commit 320dad5ff7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/content/xml/document/src/nsXMLContentSink.cpp
View File

@@ -1224,6 +1224,12 @@ nsXMLContentSink::HandleEndElement(const PRUnichar *aName)
NS_ASSERTION(content, "failed to pop content");
result = CloseElement(content, &appendContent);
// Make sure to pop the namespaces no matter whether CloseElement
// succeeded.
nsINameSpace* nameSpace = PopNameSpaces().get();
NS_IF_RELEASE(nameSpace);
NS_ENSURE_SUCCESS(result, result);
if (mDocElement == content) {
@@ -1236,9 +1242,6 @@ nsXMLContentSink::HandleEndElement(const PRUnichar *aName)
parent->AppendChildTo(content, PR_FALSE, PR_FALSE);
}
nsINameSpace* nameSpace = PopNameSpaces().get();
NS_IF_RELEASE(nameSpace);
if (mNeedToBlockParser || (mParser && !mParser->IsParserEnabled())) {
if (mParser) mParser->BlockParser();
result = NS_ERROR_HTMLPARSER_BLOCK;