From c35619cc530f82f124a4c0faea3b515e5e941166 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Thu, 1 Jul 1999 07:28:47 +0000 Subject: [PATCH] fix crash. when I launch apprunner -pref, I hit the assertion. then I crash because I dereference null. git-svn-id: svn://10.0.0.236/trunk@37668 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp | 1 + mozilla/layout/tables/FixedTableLayoutStrategy.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp index 31c01d07342..fbc44dd6dd1 100644 --- a/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp @@ -113,6 +113,7 @@ PRBool FixedTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aComputed // Get column information nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); NS_ASSERTION(nsnull != colFrame, "bad col frame"); + if (!colFrame) return PR_FALSE; // Get the columns's style const nsStylePosition* colPosition; diff --git a/mozilla/layout/tables/FixedTableLayoutStrategy.cpp b/mozilla/layout/tables/FixedTableLayoutStrategy.cpp index 31c01d07342..fbc44dd6dd1 100644 --- a/mozilla/layout/tables/FixedTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/FixedTableLayoutStrategy.cpp @@ -113,6 +113,7 @@ PRBool FixedTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aComputed // Get column information nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX); NS_ASSERTION(nsnull != colFrame, "bad col frame"); + if (!colFrame) return PR_FALSE; // Get the columns's style const nsStylePosition* colPosition;