From 490883811099db289db93051c1bf419680498452 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Mon, 30 Apr 2018 23:06:51 +0200
Subject: Bug 1337622 - Temporarily fall back to SystemPrincipal if History
 entry does not have a valid triggeringPrincipal

---
 docshell/base/nsDocShell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docshell')

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
-- 
cgit v1.2.3