From ced2ee490a10dd4918050d549ef1639bb42d871a Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Wed, 9 Aug 2000 02:30:58 +0000 Subject: [PATCH] Bug #1642 --> don't run JS urls with the default browser (effects shrimp only) r=prass git-svn-id: svn://10.0.0.236/trunk@75848 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDocShell.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index fd9eb327200..b8f6e7a006e 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -3007,11 +3007,15 @@ NS_IMETHODIMP nsDocShell::DoURILoad(nsIURI* aURI, nsIURI* aReferrerURI, { nsXPIDLCString urlScheme; aURI->GetScheme(getter_Copies(urlScheme)); - nsCOMPtr extProtService (do_GetService(NS_EXTERNALPROTOCOLSERVICE_PROGID)); - PRBool haveHandler = PR_FALSE; - extProtService->ExternalProtocolHandlerExists(urlScheme, &haveHandler); - if (haveHandler) - return extProtService->LoadUrl(aURI); + // don't do it for javascript urls! + if (urlScheme && nsCRT::strcasecmp("javascript", urlScheme)) + { + nsCOMPtr extProtService (do_GetService(NS_EXTERNALPROTOCOLSERVICE_PROGID)); + PRBool haveHandler = PR_FALSE; + extProtService->ExternalProtocolHandlerExists(urlScheme, &haveHandler); + if (haveHandler) + return extProtService->LoadUrl(aURI); + } } nsCOMPtr uriLoader(do_GetService(NS_URI_LOADER_PROGID)); NS_ENSURE_TRUE(uriLoader, NS_ERROR_FAILURE);