summaryrefslogtreecommitdiffstats
path: root/docshell/base
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-30 23:06:51 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-30 23:06:51 +0200
commit490883811099db289db93051c1bf419680498452 (patch)
treef76f5cb31826a1c1e41412c4361d48087fec90f0 /docshell/base
parent3dec348f43b3633cdcd1cfa52bc24b0fba45cb84 (diff)
downloadUXP-490883811099db289db93051c1bf419680498452.tar
UXP-490883811099db289db93051c1bf419680498452.tar.gz
UXP-490883811099db289db93051c1bf419680498452.tar.lz
UXP-490883811099db289db93051c1bf419680498452.tar.xz
UXP-490883811099db289db93051c1bf419680498452.zip
Bug 1337622 - Temporarily fall back to SystemPrincipal if History entry does not have a valid triggeringPrincipal
Diffstat (limited to 'docshell/base')
-rw-r--r--docshell/base/nsDocShell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 1a6099d7a..39a39d917 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -12664,7 +12664,7 @@ nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, uint32_t aLoadType)
MOZ_ASSERT(triggeringPrincipal,
"need a valid triggeringPrincipal to load from history");
if (!triggeringPrincipal) {
- return NS_ERROR_FAILURE;
+ triggeringPrincipal = nsContentUtils::GetSystemPrincipal();
}
// Passing nullptr as aSourceDocShell gives the same behaviour as before