зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1370263: Null check document URI before matching content scripts. r=mixedpuppy
MozReview-Commit-ID: IB8HMmukD1h --HG-- extra : rebase_source : 7267ae37b0b0d5813ce5510c1aeb225e16649bba
This commit is contained in:
Родитель
ec02e78c40
Коммит
d2ac9519c1
|
@ -244,7 +244,9 @@ ExtensionPolicyService::CheckDocument(nsIDocument* aDocument)
|
|||
{
|
||||
nsCOMPtr<nsPIDOMWindowOuter> win = aDocument->GetWindow();
|
||||
if (win) {
|
||||
CheckContentScripts(win.get(), false);
|
||||
if (win->GetDocumentURI()) {
|
||||
CheckContentScripts(win.get(), false);
|
||||
}
|
||||
|
||||
nsIPrincipal* principal = aDocument->NodePrincipal();
|
||||
|
||||
|
@ -279,7 +281,7 @@ ExtensionPolicyService::CheckWindow(nsPIDOMWindowOuter* aWindow)
|
|||
|
||||
nsCOMPtr<nsIURI> uri = doc->GetDocumentURI();
|
||||
bool equal;
|
||||
if (NS_FAILED(uri->EqualsExceptRef(aboutBlank, &equal)) || !equal) {
|
||||
if (!uri || NS_FAILED(uri->EqualsExceptRef(aboutBlank, &equal)) || !equal) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче