1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QCocoaA(11)y: do not try to access an element if rowIndex == -1

Browse Source 
This ends up in out of bounds exception.

Pick-to: 6.6 6.6.2 6.5
Fixes: QTBUG-120469
Fixes: QTBUG-121008
Change-Id: Id895f311bbb59a3734ecadd0d2472a4018332e16
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 75a918d487aabacd2d377e1e79baea7d30deb5ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timur Pocheptsov 2024-01-15 15:15:12 +01:00 committed by Qt Cherry-pick Bot
parent 463e6698da
commit 1e0a6b3160
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
View File

@ -563,7 +563,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
else if (QAccessibleTableCellInterface *cell = iface->tableCellInterface()) else if (QAccessibleTableCellInterface *cell = iface->tableCellInterface())
rowIndex = cell->rowIndex(); rowIndex = cell->rowIndex();
Q_ASSERT(tableElement->rows); Q_ASSERT(tableElement->rows);
if (rowIndex > int([tableElement->rows count])) if (rowIndex > int([tableElement->rows count]) || rowIndex == -1)
return nil; return nil;
QMacAccessibilityElement *rowElement = tableElement->rows[rowIndex]; QMacAccessibilityElement *rowElement = tableElement->rows[rowIndex];
return NSAccessibilityUnignoredAncestor(rowElement); return NSAccessibilityUnignoredAncestor(rowElement);