Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 394485: Prevent loading blocklisted urls loaded from <object> tags. r=jonas, sr=biesi, blocking1.9=stuart

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@247681 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dcamp%mozilla.com
2008-03-12 21:52:55 +00:00
parent c52ff1c761
commit 818a3abe5f
8 changed files with 186 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -4958,12 +4958,7 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
// If this load is being checked by the URI classifier, we need to
// query the classifier again for the new URI.
if (mClassifier) {
mClassifier->SetChannel(aNewChannel);
// we call the nsClassifierCallback:Run() from the main loop to
// give the channel a chance to AsyncOpen() the channel before
// we suspend it.
NS_DispatchToCurrentThread(mClassifier);
mClassifier->OnRedirect(aOldChannel, aNewChannel);
}
nsCOMPtr<nsIGlobalHistory3> history3(do_QueryInterface(mGlobalHistory));
@@ -7503,8 +7498,7 @@ nsDocShell::CheckClassifier(nsIChannel *aChannel)
nsRefPtr<nsClassifierCallback> classifier = new nsClassifierCallback();
if (!classifier) return NS_ERROR_OUT_OF_MEMORY;
classifier->SetChannel(aChannel);
nsresult rv = classifier->Run();
nsresult rv = classifier->Start(aChannel);
if (rv == NS_ERROR_FACTORY_NOT_REGISTERED ||
rv == NS_ERROR_NOT_AVAILABLE) {
// no URI classifier => ignored cases
@@ -9326,9 +9320,10 @@ nsDocShell::IsOKToLoadURI(nsIURI* aURI)
// nsClassifierCallback
//*****************************************************************************
NS_IMPL_THREADSAFE_ISUPPORTS2(nsClassifierCallback,
nsIURIClassifierCallback,
nsIRunnable)
NS_IMPL_ISUPPORTS3(nsClassifierCallback,
nsIChannelClassifier,
nsIURIClassifierCallback,
nsIRunnable)
NS_IMETHODIMP
nsClassifierCallback::Run()
@@ -9497,7 +9492,27 @@ nsClassifierCallback::OnClassifyComplete(nsresult aErrorCode)
return NS_OK;
}
void
NS_IMETHODIMP
nsClassifierCallback::Start(nsIChannel *aChannel)
{
mChannel = aChannel;
return Run();
}
NS_IMETHODIMP
nsClassifierCallback::OnRedirect(nsIChannel *aOldChannel,
nsIChannel *aNewChannel)
{
mChannel = aNewChannel;
// we call the Run() from the main loop to give the channel a
// chance to AsyncOpen() before we suspend it.
NS_DispatchToCurrentThread(this);
return NS_OK;
}
NS_IMETHODIMP
nsClassifierCallback::Cancel()
{
if (mSuspendedChannel) {
@@ -9513,4 +9528,6 @@ nsClassifierCallback::Cancel()
if (mChannel) {
mChannel = nsnull;
}
return NS_OK;
}