From c06191a72686dd4273ad18d1e3aec09297d34a30 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Fri, 16 Jun 2000 13:37:46 +0000 Subject: [PATCH] Fixing nsbeta2+ bug 41588, accessing document.documentElement on an empty document in JS threw a NS_ERROR_FAILURE exception in stead of just returning null. r=heikki@citec.fi --- content/base/src/nsDocument.cpp | 4 +++- layout/base/src/nsDocument.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index ccf5d68392e..d2350a6d457 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -2058,11 +2058,13 @@ nsDocument::GetDocumentElement(nsIDOMElement** aDocumentElement) return NS_ERROR_NULL_POINTER; } - nsresult res = NS_ERROR_FAILURE; + nsresult res = NS_OK; if (nsnull != mRootContent) { res = mRootContent->QueryInterface(NS_GET_IID(nsIDOMElement), (void**)aDocumentElement); NS_ASSERTION(NS_OK == res, "Must be a DOM Element"); + } else { + *aDocumentElement = nsnull; } return res; diff --git a/layout/base/src/nsDocument.cpp b/layout/base/src/nsDocument.cpp index ccf5d68392e..d2350a6d457 100644 --- a/layout/base/src/nsDocument.cpp +++ b/layout/base/src/nsDocument.cpp @@ -2058,11 +2058,13 @@ nsDocument::GetDocumentElement(nsIDOMElement** aDocumentElement) return NS_ERROR_NULL_POINTER; } - nsresult res = NS_ERROR_FAILURE; + nsresult res = NS_OK; if (nsnull != mRootContent) { res = mRootContent->QueryInterface(NS_GET_IID(nsIDOMElement), (void**)aDocumentElement); NS_ASSERTION(NS_OK == res, "Must be a DOM Element"); + } else { + *aDocumentElement = nsnull; } return res;