bug 420425 correction, untangled patches.

git-svn-id: svn://10.0.0.236/trunk@248229 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dveditz%cruzio.com 2008-03-19 23:40:56 +00:00
parent 7b4f8cdc66
commit 8fb68b8f10

View File

@ -1092,8 +1092,8 @@ nsDocShell::ValidateOrigin(nsIDocShellTreeItem* aOriginTreeItem,
innerTargetURI = NS_GetInnermostURI(targetURI);
return innerOriginURI && innerTargetURI &&
NS_SUCCEEDED(originURI->SchemeIs("file", &originIsFile)) &&
NS_SUCCEEDED(targetURI->SchemeIs("file", &targetIsFile)) &&
NS_SUCCEEDED(innerOriginURI->SchemeIs("file", &originIsFile)) &&
NS_SUCCEEDED(innerTargetURI->SchemeIs("file", &targetIsFile)) &&
originIsFile && targetIsFile;
}