Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 12470. Check for null pointer in SetParent(); occurs during teardown.

Browse Source
This commit is contained in:
waterson%netscape.com 1999-08-26 04:28:47 +00:00
parent a079c6ff90
commit 7b7f065d98
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/xul/content/src/nsXULElement.cpp
View File

@ -1664,7 +1664,7 @@ RDFElementImpl::SetParent(nsIContent* aParent)
// If we're an observes node, then we need to add our parent element
// as a broadcast listener.
if (tagName && tagName.get() == kObservesAtom) {
if (mDocument && tagName && tagName.get() == kObservesAtom) {
// Find the node that we're supposed to be
// observing and perform the hookup.
nsAutoString elementValue;
@ -1677,6 +1677,10 @@ RDFElementImpl::SetParent(nsIContent* aParent)
attributeValue);
nsCOMPtr<nsIDOMXULDocument> xulDocument( do_QueryInterface(mDocument) );
NS_ASSERTION(xulDocument != nsnull, "not in a XUL document");
if (! xulDocument)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIDOMElement> domElement;
xulDocument->GetElementById(elementValue, getter_AddRefs(domElement));

6
rdf/content/src/nsRDFElement.cpp
View File

@ -1664,7 +1664,7 @@ RDFElementImpl::SetParent(nsIContent* aParent)
// If we're an observes node, then we need to add our parent element
// as a broadcast listener.
if (tagName && tagName.get() == kObservesAtom) {
if (mDocument && tagName && tagName.get() == kObservesAtom) {
// Find the node that we're supposed to be
// observing and perform the hookup.
nsAutoString elementValue;
@ -1677,6 +1677,10 @@ RDFElementImpl::SetParent(nsIContent* aParent)
attributeValue);
nsCOMPtr<nsIDOMXULDocument> xulDocument( do_QueryInterface(mDocument) );
NS_ASSERTION(xulDocument != nsnull, "not in a XUL document");
if (! xulDocument)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIDOMElement> domElement;
xulDocument->GetElementById(elementValue, getter_AddRefs(domElement));

6
rdf/content/src/nsXULElement.cpp
View File

@ -1664,7 +1664,7 @@ RDFElementImpl::SetParent(nsIContent* aParent)
// If we're an observes node, then we need to add our parent element
// as a broadcast listener.
if (tagName && tagName.get() == kObservesAtom) {
if (mDocument && tagName && tagName.get() == kObservesAtom) {
// Find the node that we're supposed to be
// observing and perform the hookup.
nsAutoString elementValue;
@ -1677,6 +1677,10 @@ RDFElementImpl::SetParent(nsIContent* aParent)
attributeValue);
nsCOMPtr<nsIDOMXULDocument> xulDocument( do_QueryInterface(mDocument) );
NS_ASSERTION(xulDocument != nsnull, "not in a XUL document");
if (! xulDocument)
return NS_ERROR_UNEXPECTED;
nsCOMPtr<nsIDOMElement> domElement;
xulDocument->GetElementById(elementValue, getter_AddRefs(domElement));