14 lines
955 B
Diff
14 lines
955 B
Diff
diff -ur qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/rendering/FixedTableLayout.cpp qt-everywhere-opensource-src-4.6.3-CVE-1774/src/3rdparty/webkit/WebCore/rendering/FixedTableLayout.cpp
|
|
--- qt-everywhere-opensource-src-4.6.3/src/3rdparty/webkit/WebCore/rendering/FixedTableLayout.cpp 2010-06-02 04:03:11.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.6.3-CVE-1774/src/3rdparty/webkit/WebCore/rendering/FixedTableLayout.cpp 2010-06-11 14:45:02.625278334 +0200
|
|
@@ -168,8 +168,7 @@
|
|
|
|
int usedSpan = 0;
|
|
int i = 0;
|
|
- while (usedSpan < span) {
|
|
- ASSERT(cCol + i < nEffCols);
|
|
+ while (usedSpan < span && cCol + i < nEffCols) {
|
|
int eSpan = m_table->spanOfEffCol(cCol + i);
|
|
// Only set if no col element has already set it.
|
|
if (m_width[cCol + i].isAuto() && w.type() != Auto) {
|