From 01e6f26d4bc9635c444687a2ce04eccb45ad283d Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Thu, 11 May 2000 01:33:25 +0000 Subject: [PATCH] Bug 32898: Fix crash when targetting new window. r=rpotts --- uriloader/base/nsURILoader.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp index 5685801cec9..66f4c747d50 100644 --- a/uriloader/base/nsURILoader.cpp +++ b/uriloader/base/nsURILoader.cpp @@ -659,8 +659,14 @@ nsresult nsURILoader::SetupLoadCookie(nsISupports * aWindowContext, } // if we don't have a load cookie already } // if we have a cntListener - rv = loadCookie->QueryInterface(NS_GET_IID(nsIInterfaceRequestor), + // loadCookie may be null - for example, if popupWin is + // not a defined window. The following prevents a crash (Bug 32898) + if (loadCookie) { + rv = loadCookie->QueryInterface(NS_GET_IID(nsIInterfaceRequestor), (void**)aLoadCookie); + } else { + rv = NS_ERROR_UNEXPECTED; + } return rv; }