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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit f6df458cfa6e41175aa295aba0ca6cdd5ce66712
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 29 21:15:36 2003 +0000

    	Fix crasher in border collapsing code.
    
            Reviewed by kocienda
    
            * khtml/rendering/render_table.cpp:
            (RenderTable::cellRight):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fd927c9..153a752 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-10-29  David Hyatt  <hyatt at apple.com>
+
+	Fix crasher in border collapsing code.
+	
+        Reviewed by kocienda
+
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::cellRight):
+
 2003-10-28  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 5bdd753..afecd6d 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -811,7 +811,7 @@ RenderTableCell* RenderTable::cellLeft(const RenderTableCell* cell) const
 RenderTableCell* RenderTable::cellRight(const RenderTableCell* cell) const
 {
     int effCol = colToEffCol(cell->col()+cell->colSpan());
-    if (effCol == numEffCols()-1)
+    if (effCol >= numEffCols())
         return 0;
     RenderTableCell* result = cell->section()->cellAt(cell->row(), effCol);
     return (result == (RenderTableCell*)-1) ? 0 : result;

-- 
WebKit Debian packaging