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

remove deadcode and fix a potential 0 deref, bug 333356 r/sr=bzbarsky

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@194449 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bmlk%gmx.de
2006-04-15 04:56:52 +00:00
parent 4f4502bfa0
commit d7cd1bb343
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/layout/tables/nsCellMap.cpp
View File

@@ -1004,12 +1004,9 @@ nsTableCellMap::SetBCBorderCorner(Corner aCorner,
BCData* bcData = nsnull;
if (GetColCount() <= xPos) {
NS_ASSERTION(xPos == GetColCount(), "program error");
if (aIsBottomRight) { // at the bottom right corner
bcData = &mBCInfo->mLowerRightCorner;
}
else { // at the right edge of the table
bcData = GetRightMostBorder(yPos);
}
// at the right edge of the table as we checked the corner before
NS_ASSERTION(!aIsBottomRight, "should be handled before");
bcData = GetRightMostBorder(yPos);
}
else {
cellData = (BCCellData*)aCellMap.GetDataAt(*this, rgYPos, xPos, PR_FALSE);
@@ -1720,7 +1717,7 @@ PRInt32 nsCellMap::GetEffectiveColSpan(nsTableCellMap& aMap,
// pay the price of looking up the cell's colspan here.
if (!hitOverlap && data->IsOverlap()) {
CellData* origData = GetDataAt(aMap, aRowIndex, aColIndex, PR_TRUE);
if (origData->IsOrig()) {
if (origData && origData->IsOrig()) {
nsTableCellFrame* cellFrame = origData->GetCellFrame();
if (cellFrame) {
// possible change the number of colums to iterate