Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 392873. Make some code debug-only and add mitigation code to try to not crash when we're getting into the bad state, setting a viewer on a session history item that already has one. r+sr=bzbarsky

Browse Source
This commit is contained in:
roc+@cs.cmu.edu 2007-11-15 17:35:41 -08:00
parent 47d7e8958e
commit 4d69f5a10c
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docshell/shistory/src/nsSHEntry.cpp
View File

@ -161,15 +161,14 @@ nsSHEntry::~nsSHEntry()
viewer->Destroy();
}
#ifdef DEBUG
// This is not happening as far as I can tell from breakpad as of early November 2007
nsExpirationTracker<nsSHEntry,3>::Iterator iterator(gHistoryTracker);
nsSHEntry* elem;
while ((elem = iterator.Next()) != nsnull) {
NS_ASSERTION(elem != this, "Found dead entry still in the tracker!");
if (elem == this) {
// CRASH NOW (not later)
*(int*)0 = 0;
}
}
#endif
}
//*****************************************************************************
@ -228,19 +227,14 @@ nsSHEntry::SetContentViewer(nsIContentViewer *aViewer)
{
NS_PRECONDITION(!aViewer || !mContentViewer, "SHEntry already contains viewer");
if (!aViewer) {
if (mContentViewer || !aViewer) {
DropPresentationState();
}
mContentViewer = aViewer;
if (mContentViewer) {
if (mExpirationState.IsTracked()) {
NS_ERROR("This object should not already be in the tracker!!!");
*(int*)0 = 0; // CRASH, take this out before we release for real!
} else {
gHistoryTracker->AddObject(this);
}
gHistoryTracker->AddObject(this);
nsCOMPtr<nsIDOMDocument> domDoc;
mContentViewer->GetDOMDocument(getter_AddRefs(domDoc));