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

bug 13630, r=troy, a=leaf, Added a null check to prevent a crash.

Browse Source
This commit is contained in:
nisheeth%netscape.com 1999-09-24 01:58:32 +00:00
parent 5a207c767a
commit 19143aa5fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layout/base/nsPresShell.cpp
View File

@ -1725,9 +1725,9 @@ PresShell::ContentAppended(nsIDocument *aDocument,
// If history state has been set by session history, ask the frame manager // If history state has been set by session history, ask the frame manager
// to restore frame state for the frame hierarchy created for the chunk of // to restore frame state for the frame hierarchy created for the chunk of
// content that just came in. // content that just came in.
nsIFrame* frame = nsnull; nsIFrame* frame;
rv = GetPrimaryFrameFor(aContainer, &frame); rv = GetPrimaryFrameFor(aContainer, &frame);
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv) && nsnull != frame)
mFrameManager->RestoreFrameState(frame, mHistoryState); mFrameManager->RestoreFrameState(frame, mHistoryState);
} }

4
layout/html/base/src/nsPresShell.cpp
View File

@ -1725,9 +1725,9 @@ PresShell::ContentAppended(nsIDocument *aDocument,
// If history state has been set by session history, ask the frame manager // If history state has been set by session history, ask the frame manager
// to restore frame state for the frame hierarchy created for the chunk of // to restore frame state for the frame hierarchy created for the chunk of
// content that just came in. // content that just came in.
nsIFrame* frame = nsnull; nsIFrame* frame;
rv = GetPrimaryFrameFor(aContainer, &frame); rv = GetPrimaryFrameFor(aContainer, &frame);
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv) && nsnull != frame)
mFrameManager->RestoreFrameState(frame, mHistoryState); mFrameManager->RestoreFrameState(frame, mHistoryState);
} }