[tor-commits] [tor-browser] 34/311: Bug 1748912 - Add null check in CanonicalBrowsingContext::RemoveFromSessionHistory. r=smaug, a=dsmith

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch geckoview-99.0.1-11.0-1
in repository tor-browser.

commit 5a4bd2a35d3d0dd021948f6ce6569c7144915ad2
Author: Andrew McCreight <continuation at gmail.com>
AuthorDate: Fri Jan 7 14:16:07 2022 +0000

    Bug 1748912 - Add null check in CanonicalBrowsingContext::RemoveFromSessionHistory. r=smaug, a=dsmith
    
    Differential Revision: https://phabricator.services.mozilla.com/D135270
---
 docshell/base/CanonicalBrowsingContext.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
index d995cc9afbe9a..92cd326731e65 100644
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
@@ -1038,9 +1038,9 @@ void CanonicalBrowsingContext::RemoveFromSessionHistory(const nsID& aChangeID) {
       BrowsingContext* rootBC = shistory->GetBrowsingContext();
       if (rootBC) {
         if (!rootBC->IsInProcess()) {
-          Unused << rootBC->Canonical()
-                        ->GetContentParent()
-                        ->SendDispatchLocationChangeEvent(rootBC);
+          if (ContentParent* cp = rootBC->Canonical()->GetContentParent()) {
+            Unused << cp->SendDispatchLocationChangeEvent(rootBC);
+          }
         } else if (rootBC->GetDocShell()) {
           rootBC->GetDocShell()->DispatchLocationChangeEvent();
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.