From 85d3b90bc2ee054c6bff52ef0e1721c3f436b58b Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Thu, 1 Apr 1999 02:30:03 +0000 Subject: [PATCH] Check to make sure that you have content in the doc before doing GetElementById(). (This was causing crash in SearchForNodeByID() -- thanks to law@netscape.com for the fix.) git-svn-id: svn://10.0.0.236/trunk@25794 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xul/document/src/nsXULDocument.cpp | 4 ++++ mozilla/rdf/content/src/nsXULDocument.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 57acb8a8199..eb142d80b22 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -2321,6 +2321,10 @@ XULDocumentImpl::GetRdf(nsIRDFService** aRDFService) NS_IMETHODIMP XULDocumentImpl::GetElementById(const nsString& aId, nsIDOMElement** aReturn) { + NS_PRECONDITION(mRootContent != nsnull, "document contains no content"); + if (! mRootContent) + return NS_ERROR_NOT_INITIALIZED; // XXX right error code? + nsresult rv; nsAutoString uri(aId); diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp index 57acb8a8199..eb142d80b22 100644 --- a/mozilla/rdf/content/src/nsXULDocument.cpp +++ b/mozilla/rdf/content/src/nsXULDocument.cpp @@ -2321,6 +2321,10 @@ XULDocumentImpl::GetRdf(nsIRDFService** aRDFService) NS_IMETHODIMP XULDocumentImpl::GetElementById(const nsString& aId, nsIDOMElement** aReturn) { + NS_PRECONDITION(mRootContent != nsnull, "document contains no content"); + if (! mRootContent) + return NS_ERROR_NOT_INITIALIZED; // XXX right error code? + nsresult rv; nsAutoString uri(aId);