corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make setting innerHTML in XHTML not crash on malformed content and throw an

Browse Source 
exception instead.  Bug 272011, patch by steve.swanson@mackichan.com,
r+sr=bzbarsky
This commit is contained in:
bzbarsky@mit.edu
2004-12-04 17:51:12 +00:00
parent 9a73a8df40
commit f68a9e1221
4 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
content/xml/document/src/nsXMLContentSink.cpp
View File

@@ -1338,15 +1338,6 @@ nsXMLContentSink::HandleXMLDeclaration(const PRUnichar *aData,
NS_IMETHODIMP
nsXMLContentSink::ReportError(const PRUnichar* aErrorText,
const PRUnichar* aSourceText)
{
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(mDocument));
return ReportErrorFrom( aErrorText, aSourceText, node );
}
NS_IMETHODIMP
nsXMLContentSink::ReportErrorFrom(const PRUnichar* aErrorText,
const PRUnichar* aSourceText,
nsIDOMNode* aNode)
{
nsresult rv = NS_OK;
@@ -1360,13 +1351,14 @@ nsXMLContentSink::ReportErrorFrom(const PRUnichar* aErrorText,
// Clear the current content and
// prepare to set <parsererror> as the document root
if (aNode) {
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(mDocument));
if (node) {
for (;;) {
nsCOMPtr<nsIDOMNode> child, dummy;
aNode->GetLastChild(getter_AddRefs(child));
node->GetLastChild(getter_AddRefs(child));
if (!child)
break;
aNode->RemoveChild(child, getter_AddRefs(dummy));
node->RemoveChild(child, getter_AddRefs(dummy));
}
}
NS_IF_RELEASE(mDocElement);