Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

141056 r=hawara sr=dveditz a=asa

Browse Source 
add error checking to fix top crasher
This commit is contained in:
dprice%netscape.com 2002-07-24 20:42:22 +00:00
parent 829445ae98
commit 94223fb09b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dom/src/base/nsLocation.cpp
View File

@ -180,6 +180,8 @@ NS_IMETHODIMP_(void) LocationImpl::SetDocShell(nsIDocShell *aDocShell)
nsresult
LocationImpl::CheckURL(nsIURI* aURI, nsIDocShellLoadInfo** aLoadInfo)
{
*aLoadInfo = nsnull;
nsresult result;
// Get JSContext from stack.
nsCOMPtr<nsIJSContextStack>
@ -193,6 +195,16 @@ LocationImpl::CheckURL(nsIURI* aURI, nsIDocShellLoadInfo** aLoadInfo)
if (NS_FAILED(stack->Peek(&cx)))
return NS_ERROR_FAILURE;
if (!cx) {
// No cx means that there's no JS running, or at least no JS that
// was run through code that properly pushed a context onto the
// context stack (as all code that runs JS off of web pages
// does). Going further from here will crash, so lets not do
// that...
return NS_OK;
}
// Get security manager.
nsCOMPtr<nsIScriptSecurityManager>
secMan(do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &result));