[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 58754c926b7fc00bda1fd82b25949a6ffc3addf8
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 30 00:28:44 2003 +0000

    	Fix for auto width tables.  Prevent overflow when assigning from
    	the computed integer max width back into a short value.
    
    	Fixes cnn.com and spies.com. Bug # is 3158469.
    
            Reviewed by darin
    
            * khtml/rendering/table_layout.cpp:
            (AutoTableLayout::calcMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3500 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1711899..6e23ac2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for auto width tables.  Prevent overflow when assigning from
+	the computed integer max width back into a short value.
+
+	Fixes cnn.com and spies.com. Bug # is 3158469.
+	
+        Reviewed by darin
+
+        * khtml/rendering/table_layout.cpp:
+        (AutoTableLayout::calcMinMaxWidth):
+
 2003-01-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1711899..6e23ac2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-29  David Hyatt  <hyatt at apple.com>
+
+	Fix for auto width tables.  Prevent overflow when assigning from
+	the computed integer max width back into a short value.
+
+	Fixes cnn.com and spies.com. Bug # is 3158469.
+	
+        Reviewed by darin
+
+        * khtml/rendering/table_layout.cpp:
+        (AutoTableLayout::calcMinMaxWidth):
+
 2003-01-29  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/table_layout.cpp b/WebCore/khtml/rendering/table_layout.cpp
index 83a9d9c..2bfc8d2 100644
--- a/WebCore/khtml/rendering/table_layout.cpp
+++ b/WebCore/khtml/rendering/table_layout.cpp
@@ -557,6 +557,10 @@ void AutoTableLayout::calcMinMaxWidth()
 	maxWidth = minWidth;
     }
 
+    // Max widths can overflow. We need to bounds check them.
+    if (maxWidth > 10000)
+        maxWidth = 10000;
+    
     table->m_maxWidth = maxWidth;
     table->m_minWidth = minWidth;
 #ifdef DEBUG_LAYOUT

-- 
WebKit Debian packaging