Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 57039 crash in [@ nsBlockBandData::GetBandData()]

Browse Source 
r=karnaze
a=rickg, a=waterson
some simple bullet-proofing for possible null pointer dereferencing


git-svn-id: svn://10.0.0.236/trunk@81433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
buster%netscape.com
2000-10-19 05:21:26 +00:00
parent 7a8f3051c3
commit 767024fce0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/generic/nsBlockBandData.cpp
View File

@@ -98,6 +98,10 @@ nsBlockBandData::GetAvailableSpace(nscoord aY, nsRect& aResult)
nsresult
nsBlockBandData::GetBandData(nscoord aY)
{
NS_ASSERTION(mSpaceManager, "bad state, no space manager");
if (!mSpaceManager) {
return NS_ERROR_FAILURE;
}
PRInt32 iterations =0;
nsresult rv = mSpaceManager->GetBandData(aY, mSpace, *this);
while (NS_FAILED(rv)) {
@@ -108,7 +112,8 @@ nsBlockBandData::GetBandData(nscoord aY)
return NS_ERROR_FAILURE;
}
// We need more space for our bands
if (mTrapezoids != mData) {
NS_ASSERTION(mTrapezoids, "bad state, no mTrapezoids");
if (mTrapezoids && (mTrapezoids != mData)) {
delete [] mTrapezoids;
}
PRInt32 newSize = mSize * 2;
@@ -116,6 +121,7 @@ nsBlockBandData::GetBandData(nscoord aY)
newSize = mCount;
}
mTrapezoids = new nsBandTrapezoid[newSize];
NS_POSTCONDITION(mTrapezoids, "failure allocating mTrapezoids");
if (!mTrapezoids) {
return NS_ERROR_OUT_OF_MEMORY;
}