[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e2019f879e32844bc32eefe0d737ed219e758596
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 9 21:29:03 2003 +0000

    	- fixed 3284312 -- repro nil-deref in
    	khtml::RenderTable::cellAbove at pi.nersc.gov
    
            Reviewed by Darin
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::cellAbove):
    	When the section had 0 rows, we were trying to index the -1st
    	row. Fixed by falling into the "didn't find anything" case when
    	the row we're going to look in is < 0.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4505 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 85fbbf2..f6879d5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-06-09  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3284312 -- repro nil-deref in 
+	khtml::RenderTable::cellAbove at pi.nersc.gov
+
+        Reviewed by Darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::cellAbove):
+	When the section had 0 rows, we were trying to index the -1st
+	row. Fixed by falling into the "didn't find anything" case when
+	the row we're going to look in is < 0.
+
 2003-06-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 85fbbf2..f6879d5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-06-09  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3284312 -- repro nil-deref in 
+	khtml::RenderTable::cellAbove at pi.nersc.gov
+
+        Reviewed by Darin
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::cellAbove):
+	When the section had 0 rows, we were trying to index the -1st
+	row. Fixed by falling into the "didn't find anything" case when
+	the row we're going to look in is < 0.
+
 2003-06-09  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index e284be4..8c5cfee 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -650,7 +650,7 @@ RenderTableCell* RenderTable::cellAbove(RenderTableCell* cell) const
     }
 
     // Look up the cell in the section's grid, which required effective col index
-    if (section) {
+    if (section && rAbove >= 0) {
         int effCol = colToEffCol(cell->col());
         RenderTableCell* aboveCell;
         // If we hit a span back up to a real cell.

-- 
WebKit Debian packaging