corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 775796 - nsIURIClassifier.classify() should takes a principal. r=bsmith

Browse Source
This commit is contained in:
Mounir Lamouri
2012-07-20 09:46:59 -07:00
parent 78d7f5dc7b
commit f3975e39e5
5 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
View File

@@ -42,6 +42,7 @@
#include "prnetdb.h"
#include "zlib.h"
#include "mozilla/Attributes.h"
#include "nsIPrincipal.h"
// Needed to interpert mozIStorageConnection::GetLastError
#include <sqlite3.h>
@@ -4238,10 +4239,11 @@ nsUrlClassifierDBService::Init()
}
NS_IMETHODIMP
nsUrlClassifierDBService::Classify(nsIURI *uri,
nsUrlClassifierDBService::Classify(nsIPrincipal* aPrincipal,
nsIURIClassifierCallback* c,
bool* result)
{
NS_ENSURE_ARG(aPrincipal);
NS_ENSURE_TRUE(gDbBackgroundThread, NS_ERROR_NOT_INITIALIZED);
if (!(mCheckMalware || mCheckPhishing)) {
@@ -4253,6 +4255,10 @@ nsUrlClassifierDBService::Classify(nsIURI *uri,
new nsUrlClassifierClassifyCallback(c, mCheckMalware, mCheckPhishing);
if (!callback) return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr<nsIURI> uri;
aPrincipal->GetURI(getter_AddRefs(uri));
NS_ENSURE_TRUE(uri, NS_ERROR_FAILURE);
nsresult rv = LookupURI(uri, callback, false, result);
if (rv == NS_ERROR_MALFORMED_URI) {
*result = false;