From 9f6c7e98d5da93cb608bcf91eefab97f4a2e08fd Mon Sep 17 00:00:00 2001 From: "mstoltz%netscape.com" Date: Thu, 19 Oct 2000 22:21:57 +0000 Subject: [PATCH] Bug 56851, regression in XPInstall dialog. r=jst, sr=vidur git-svn-id: svn://10.0.0.236/trunk@81482 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsGlobalWindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 3c021622182..c291ea1e356 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -3044,13 +3044,16 @@ NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext *cx, nsCOMPtr secMan; if (uriToLoad) { // Get security manager, check to see if URI is allowed. + // Don't call CheckLoadURI for dialogs - see bug 56851 + // The security of this function depends on window.openDialog being + // inaccessible from web scripts nsCOMPtr newUrl; nsCOMPtr scriptCX; nsJSUtils::nsGetStaticScriptContext(cx, (JSObject *) mScriptObject, getter_AddRefs(scriptCX)); if (!scriptCX || NS_FAILED(scriptCX->GetSecurityManager(getter_AddRefs(secMan))) || - NS_FAILED(secMan->CheckLoadURIFromScript(cx, uriToLoad))) + ((!aDialog && NS_FAILED(secMan->CheckLoadURIFromScript(cx, uriToLoad))))) return NS_ERROR_FAILURE; }