[tor-commits] [tor-browser] 54/311: Bug 1751919 - Crash in [@ mozilla::dom::SessionHistoryEntry::ReplaceWith]. r=smaug, a=RyanVM

[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 85a6dea087f75d5cfb1d239d894af09f016c1edb
Author: Peter Van der Beken <peterv at propagandism.org>
AuthorDate: Fri Jan 28 18:52:21 2022 +0000

    Bug 1751919 - Crash in [@ mozilla::dom::SessionHistoryEntry::ReplaceWith]. r=smaug, a=RyanVM
    
    Differential Revision: https://phabricator.services.mozilla.com/D137305
---
 docshell/base/CanonicalBrowsingContext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
index 8f71ff71002a0..6075b4bb77edf 100644
--- a/docshell/base/CanonicalBrowsingContext.cpp
+++ b/docshell/base/CanonicalBrowsingContext.cpp
@@ -814,7 +814,7 @@ void CanonicalBrowsingContext::SessionHistoryCommit(
           mActiveEntry = newActiveEntry;
         } else if (LOAD_TYPE_HAS_FLAGS(
                        aLoadType, nsIWebNavigation::LOAD_FLAGS_IS_REFRESH) &&
-                   !ShouldAddEntryForRefresh(newActiveEntry)) {
+                   !ShouldAddEntryForRefresh(newActiveEntry) && mActiveEntry) {
           addEntry = false;
           mActiveEntry->ReplaceWith(*newActiveEntry);
         } else {

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