Bug 1667035 - Crash in [@ mozilla::dom::CanonicalBrowsingContext::Rem…

…oveDynEntriesFromActiveSessionHistoryEntry], r=jesup Differential Revision: https://phabricator.services.mozilla.com/D91632
iaxat · Sep 29, 2020 · afc67e4 · afc67e4
1 parent a15467b
commit afc67e4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -623,6 +623,9 @@ void CanonicalBrowsingContext::ReplaceActiveSessionHistoryEntry(
 
 void CanonicalBrowsingContext::RemoveDynEntriesFromActiveSessionHistoryEntry() {
   nsISHistory* shistory = GetSessionHistory();
+  // In theory shistory can be null here if the method is called right after
+  // CanonicalBrowsingContext::ReplacedBy call.
+  NS_ENSURE_TRUE_VOID(shistory);
   nsCOMPtr<nsISHEntry> root = nsSHistory::GetRootSHEntry(mActiveEntry);
   shistory->RemoveDynEntries(shistory->GetIndexOfEntry(root), mActiveEntry);
 }