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

Fix null pointer bugs (35785 and nonfiled), fixes editor bug 35885. r=evaughan

Browse Source
This commit is contained in:
cmanske%netscape.com 2000-04-15 01:57:16 +00:00
parent 71eac1e422
commit 48f67d5e5a
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/xul/base/src/nsMenuFrame.cpp
View File

@ -1477,6 +1477,8 @@ nsMenuFrame::GetPrefSize(nsBoxLayoutState& aState, nsSize& aSize)
if (!frame) {
MarkAsGenerated();
frame = mPopupFrames.FirstChild();
// No child - just return
if (!frame) return NS_OK;
}
nsIBox* ibox = nsnull;

29
layout/xul/base/src/nsTempleLayout.cpp
View File

@ -147,21 +147,22 @@ nsTempleLayout::BuildBoxSizeList(nsIBox* aBox, nsBoxLayoutState& aState, nsBoxSi
while(box) {
nsIMonument* monument = nsnull;
box->GetLayoutManager(getter_AddRefs(layout));
layout->QueryInterface(NS_GET_IID(nsIMonument), (void**)&monument);
if (monument)
monument->BuildBoxSizeList(box, aState, first, last);
else {
nsMonumentLayout::BuildBoxSizeList(box, aState, first, last);
first->bogus = PR_TRUE;
if (layout) {
layout->QueryInterface(NS_GET_IID(nsIMonument), (void**)&monument);
if (monument)
monument->BuildBoxSizeList(box, aState, first, last);
else {
nsMonumentLayout::BuildBoxSizeList(box, aState, first, last);
first->bogus = PR_TRUE;
}
if (count == 0)
aFirst = first;
else
(aLast)->next = first;
aLast = last;
}
if (count == 0)
aFirst = first;
else
(aLast)->next = first;
aLast = last;
box->GetNextBox(&box);
count++;