wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 20:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1334875 - Temporarily remove assertion that history loads pass a valid triggeringprincipal

Browse source
This commit is contained in:
janekptacijarabaci 2018-04-30 23:48:06 +02:00 • committed by Roy Tam
commit 3f7f553a82
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docshell/base/nsDocShell.cpp
View file

@ -12663,9 +12663,6 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType)
srcdoc = NullString(); srcdoc = NullString();
} }
// If there is no valid triggeringPrincipal, we deny the load
MOZ_ASSERT(triggeringPrincipal,
"need a valid triggeringPrincipal to load from history");
if (!triggeringPrincipal) { if (!triggeringPrincipal) {
triggeringPrincipal = nsContentUtils::GetSystemPrincipal(); triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
} }

4
docshell/shistory/nsSHEntry.cpp
View file

@ -518,10 +518,6 @@ nsSHEntry::GetTriggeringPrincipal(nsIPrincipal** aTriggeringPrincipal)
NS_IMETHODIMP NS_IMETHODIMP
nsSHEntry::SetTriggeringPrincipal(nsIPrincipal* aTriggeringPrincipal) nsSHEntry::SetTriggeringPrincipal(nsIPrincipal* aTriggeringPrincipal)
{ {
MOZ_ASSERT(aTriggeringPrincipal, "need a valid triggeringPrincipal");
if (!aTriggeringPrincipal) {
return NS_ERROR_FAILURE;
}
mShared->mTriggeringPrincipal = aTriggeringPrincipal; mShared->mTriggeringPrincipal = aTriggeringPrincipal;
return NS_OK; return NS_OK;
} }