Title: [118281] trunk/Source/WebCore
Revision
118281
Author
[email protected]
Date
2012-05-23 17:30:53 -0700 (Wed, 23 May 2012)

Log Message

AX: Prevents assertion from potentially dereferencing null pointer.
https://bugs.webkit.org/show_bug.cgi?id=87290

Patch by David Tseng <[email protected]> on 2012-05-23
Reviewed by Chris Fleizach.

Changes to assertions. Coverage by existing tests.

* accessibility/AccessibilityTable.cpp:
(WebCore::AccessibilityTable::cellForColumnAndRow):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (118280 => 118281)


--- trunk/Source/WebCore/ChangeLog	2012-05-24 00:25:45 UTC (rev 118280)
+++ trunk/Source/WebCore/ChangeLog	2012-05-24 00:30:53 UTC (rev 118281)
@@ -1,3 +1,15 @@
+2012-05-23  David Tseng  <[email protected]>
+
+        AX: Prevents assertion from potentially dereferencing null pointer.
+        https://bugs.webkit.org/show_bug.cgi?id=87290
+
+        Reviewed by Chris Fleizach.
+
+        Changes to assertions. Coverage by existing tests.
+
+        * accessibility/AccessibilityTable.cpp:
+        (WebCore::AccessibilityTable::cellForColumnAndRow):
+
 2012-05-23  Tony Chang  <[email protected]>
 
         auto margins on flexbox should allocate space in the cross direction

Modified: trunk/Source/WebCore/accessibility/AccessibilityTable.cpp (118280 => 118281)


--- trunk/Source/WebCore/accessibility/AccessibilityTable.cpp	2012-05-24 00:25:45 UTC (rev 118280)
+++ trunk/Source/WebCore/accessibility/AccessibilityTable.cpp	2012-05-24 00:30:53 UTC (rev 118281)
@@ -506,7 +506,7 @@
                 for (int testRow = sectionSpecificRow - 1; testRow >= 0; --testRow) {
                     cell = tableSection->primaryCellAt(testRow, column);
                     // cell overlapped. use this one
-                    ASSERT(cell->rowSpan() >= 1);
+                    ASSERT(!cell || cell->rowSpan() >= 1);
                     if (cell && ((cell->rowIndex() + (cell->rowSpan() - 1)) >= sectionSpecificRow))
                         break;
                     cell = 0;
@@ -517,7 +517,7 @@
                     for (int testCol = column - 1; testCol >= 0; --testCol) {
                         cell = tableSection->primaryCellAt(sectionSpecificRow, testCol);
                         // cell overlapped. use this one
-                        ASSERT(cell->rowSpan() >= 1);
+                        ASSERT(!cell || cell->rowSpan() >= 1);
                         if (cell && ((cell->col() + (cell->colSpan() - 1)) >= column))
                             break;
                         cell = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to