Bug 1475964: Add null checks in nsMaiInterfaceTableCell.cpp. draft
authorRobert Bartlensky <rbartlensky@mozilla.com>
Mon, 16 Jul 2018 15:16:42 +0100
changeset 820274 2391b1108451d3be9bdb927efe970e2668319c95
parent 820131 5a8107262015714d2907a85abc24c847ad9b32d2
push id116778
push userbmo:rbartlensky@mozilla.com
push dateThu, 19 Jul 2018 10:51:06 +0000
bugs1475964
milestone63.0a1
Bug 1475964: Add null checks in nsMaiInterfaceTableCell.cpp. MozReview-Commit-ID: 5RSioCelGo3
accessible/atk/nsMaiInterfaceTableCell.cpp
--- a/accessible/atk/nsMaiInterfaceTableCell.cpp
+++ b/accessible/atk/nsMaiInterfaceTableCell.cpp
@@ -50,16 +50,19 @@ GetRowSpanCB(AtkTableCell* aCell)
   return 0;
 }
 
 static gboolean
 GetPositionCB(AtkTableCell* aCell, gint* aRow, gint* aCol)
 {
   if (AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aCell))) {
     TableCellAccessible* cell = accWrap->AsTableCell();
+    if (!cell) {
+      return false;
+    }
     *aRow = cell->RowIdx();
     *aCol = cell->ColIdx();
     return true;
   }
 
   if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aCell))) {
     uint32_t rowIdx = 0, colIdx = 0;
     proxy->GetPosition(&rowIdx, &colIdx);
@@ -71,16 +74,19 @@ GetPositionCB(AtkTableCell* aCell, gint*
   return false;
 }
 
 static gboolean
 GetColumnRowSpanCB(AtkTableCell* aCell, gint* aCol, gint* aRow,
                    gint* aColExtent, gint* aRowExtent) {
   if (AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aCell))) {
     TableCellAccessible* cellAcc = accWrap->AsTableCell();
+    if (!cellAcc) {
+      return false;
+    }
     *aCol = cellAcc->ColIdx();
     *aRow = cellAcc->RowIdx();
     *aColExtent = cellAcc->ColExtent();
     *aRowExtent = cellAcc->ColExtent();
     return true;
   }
 
   if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aCell))) {