From 066a9ee625faa27a16743b0996db92db5b73e788 Mon Sep 17 00:00:00 2001
From: kostello <kostello@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 28 May 1998 18:31:44 +0000
Subject: [PATCH] Fix crasher loading mozilla.org page

git-svn-id: svn://10.0.0.236/trunk@2513 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/html/table/src/nsTableFrame.cpp | 2 ++
 mozilla/layout/tables/nsTableFrame.cpp         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index bfe9f1b7731..b75eab30c06 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -331,6 +331,7 @@ void nsTableFrame::RecalcLayoutData()
         r2 = row + rowSpan;
         c = col;
         last = col + colSpan -1;
+        last = PR_MIN(last,colCount-1);
         
         while (c <= last)
         {
@@ -372,6 +373,7 @@ void nsTableFrame::RecalcLayoutData()
         c2 = col + colSpan;
         r = row ;
         last = row + rowSpan-1;
+        last = PR_MIN(last,rowCount-1);
         
         while (r <= last)
         {
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index bfe9f1b7731..b75eab30c06 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -331,6 +331,7 @@ void nsTableFrame::RecalcLayoutData()
         r2 = row + rowSpan;
         c = col;
         last = col + colSpan -1;
+        last = PR_MIN(last,colCount-1);
         
         while (c <= last)
         {
@@ -372,6 +373,7 @@ void nsTableFrame::RecalcLayoutData()
         c2 = col + colSpan;
         r = row ;
         last = row + rowSpan-1;
+        last = PR_MIN(last,rowCount-1);
         
         while (r <= last)
         {