From 136cb9074942f59586d4c184f6ff8c620df67b24 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Sat, 17 Nov 2001 05:19:10 +0000 Subject: [PATCH] plug leak of docshell. bug 110410 code=dbaron r=jst,me git-svn-id: svn://10.0.0.236/trunk@108351 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 057e580c143..cacfd22f303 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -265,7 +265,7 @@ NS_INTERFACE_MAP_END_THREADSAFE //***************************************************************************** NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink) { - NS_ENSURE_ARG_POINTER(aSink); + NS_PRECONDITION(aSink, "null out param"); if (aIID.Equals(NS_GET_IID(nsIURIContentListener)) && NS_SUCCEEDED(EnsureContentListener())) { @@ -292,6 +292,7 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink) else if (aIID.Equals(NS_GET_IID(nsIDOMDocument)) && NS_SUCCEEDED(EnsureContentViewer())) { mContentViewer->GetDOMDocument((nsIDOMDocument **) aSink); + return NS_OK; } else if (aIID.Equals(NS_GET_IID(nsIPrompt))) { nsCOMPtr prompter(do_GetInterface(mTreeOwner));