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

check for null to not crash is good. 115350 thanks to Shataro

Browse Source
This commit is contained in:
mjudge%netscape.com 2002-02-13 21:40:46 +00:00
parent 79a9d93160
commit b9ae5a3078
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/generic/nsFrame.cpp
View File

@ -616,7 +616,7 @@ nsFrame::Paint(nsIPresContext* aPresContext,
result = shell->GetSelectionFlags(&displaySelection);
if (NS_FAILED(result))
return result;
if (!(displaySelection &= nsISelectionDisplay::DISPLAY_FRAMES))
if (!(displaySelection & nsISelectionDisplay::DISPLAY_FRAMES))
return NS_OK;
}
@ -3436,7 +3436,7 @@ nsFrame::PeekOffset(nsIPresContext* aPresContext, nsPeekOffsetStruct *aPos)
while(frame) //ok time to drill down to find iterator
{
result = frame->FirstChild(aPresContext, nsnull,&frame);
if (NS_SUCCEEDED(result))
if (frame && NS_SUCCEEDED(result))
{
result = frame->QueryInterface(NS_GET_IID(nsILineIteratorNavigator),
getter_AddRefs(iter));

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

@ -616,7 +616,7 @@ nsFrame::Paint(nsIPresContext* aPresContext,
result = shell->GetSelectionFlags(&displaySelection);
if (NS_FAILED(result))
return result;
if (!(displaySelection &= nsISelectionDisplay::DISPLAY_FRAMES))
if (!(displaySelection & nsISelectionDisplay::DISPLAY_FRAMES))
return NS_OK;
}
@ -3436,7 +3436,7 @@ nsFrame::PeekOffset(nsIPresContext* aPresContext, nsPeekOffsetStruct *aPos)
while(frame) //ok time to drill down to find iterator
{
result = frame->FirstChild(aPresContext, nsnull,&frame);
if (NS_SUCCEEDED(result))
if (frame && NS_SUCCEEDED(result))
{
result = frame->QueryInterface(NS_GET_IID(nsILineIteratorNavigator),
getter_AddRefs(iter));