Bug 1307736 - Ensure History loads pass valid triggeringPrincipal. r=bz
This commit is contained in:
@@ -12587,12 +12587,11 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType)
|
||||
srcdoc = NullString();
|
||||
}
|
||||
|
||||
// If there is no triggeringPrincipal we can fall back to using the
|
||||
// SystemPrincipal as the triggeringPrincipal for loading the history
|
||||
// entry, since the history entry can only end up in history if security
|
||||
// checks passed in the initial loading phase.
|
||||
// If there is no valid triggeringPrincipal, we deny the load
|
||||
MOZ_ASSERT(triggeringPrincipal,
|
||||
"need a valid triggeringPrincipal to load from history");
|
||||
if (!triggeringPrincipal) {
|
||||
triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
// Passing nullptr as aSourceDocShell gives the same behaviour as before
|
||||
|
||||
Reference in New Issue
Block a user