mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 06:45:42 +00:00
Bug 829872 - Return null for cross-origin contentDocument. r=bz
This commit is contained in:
parent
9b971f4a50
commit
06f27cde2c
@ -2838,6 +2838,11 @@ nsObjectLoadingContent::GetContentDocument()
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Return null for cross-origin contentDocument.
|
||||||
|
if (!nsContentUtils::GetSubjectPrincipal()->Subsumes(sub_doc->NodePrincipal())) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
return sub_doc;
|
return sub_doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,7 +64,13 @@ nsGenericHTMLFrameElement::GetContentDocument()
|
|||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
return win->GetDoc();
|
nsIDocument *doc = win->GetDoc();
|
||||||
|
|
||||||
|
// Return null for cross-origin contentDocument.
|
||||||
|
if (!nsContentUtils::GetSubjectPrincipal()->Subsumes(doc->NodePrincipal())) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
return doc;
|
||||||
}
|
}
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
|
Loading…
Reference in New Issue
Block a user