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

Accessibility macOS: check for valid interfaces

Browse Source 
There are a few places that did not check if the returned interface is valid.

Task-number: QTBUG-52536
Change-Id: I56ca0952fec0b44dfd4b3991aa94554e9c829642
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
This commit is contained in:
Frederik Gladhorn 2017-01-04 23:23:42 +01:00
parent fafdb171e0
commit d330ae0da2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -537,7 +537,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
- (void)accessibilityPerformAction:(NSString *)action { - (void)accessibilityPerformAction:(NSString *)action {
QAccessibleInterface *iface = QAccessible::accessibleInterface(axid); QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
if (iface) { if (iface && iface->isValid()) {
const QString qtAction = QCocoaAccessible::translateAction(action, iface); const QString qtAction = QCocoaAccessible::translateAction(action, iface);
QAccessibleBridgeUtils::performEffectiveAction(iface, qtAction); QAccessibleBridgeUtils::performEffectiveAction(iface, qtAction);
} }
@ -562,16 +562,16 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
int y = qt_mac_flipYCoordinate(point.y); int y = qt_mac_flipYCoordinate(point.y);
QAccessibleInterface *childInterface = iface->childAt(point.x, y); QAccessibleInterface *childInterface = iface->childAt(point.x, y);
// No child found, meaning we hit this element. // No child found, meaning we hit this element.
if (!childInterface) if (!childInterface || !childInterface->isValid())
return NSAccessibilityUnignoredAncestor(self); return NSAccessibilityUnignoredAncestor(self);
// find the deepest child at the point // find the deepest child at the point
QAccessibleInterface *childOfChildInterface = 0; QAccessibleInterface *childOfChildInterface = 0;
do { do {
childOfChildInterface = childInterface->childAt(point.x, y); childOfChildInterface = childInterface->childAt(point.x, y);
if (childOfChildInterface) if (childOfChildInterface && childOfChildInterface->isValid())
childInterface = childOfChildInterface; childInterface = childOfChildInterface;
} while (childOfChildInterface); } while (childOfChildInterface && childOfChildInterface->isValid());
QAccessible::Id childId = QAccessible::uniqueId(childInterface); QAccessible::Id childId = QAccessible::uniqueId(childInterface);
// hit a child, forward to child accessible interface. // hit a child, forward to child accessible interface.
@ -590,7 +590,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
} }
QAccessibleInterface *childInterface = iface->focusChild(); QAccessibleInterface *childInterface = iface->focusChild();
if (childInterface) { if (childInterface && childInterface->isValid()) {
QAccessible::Id childAxid = QAccessible::uniqueId(childInterface); QAccessible::Id childAxid = QAccessible::uniqueId(childInterface);
QMacAccessibilityElement *accessibleElement = [QMacAccessibilityElement elementWithId:childAxid]; QMacAccessibilityElement *accessibleElement = [QMacAccessibilityElement elementWithId:childAxid];
return NSAccessibilityUnignoredAncestor(accessibleElement); return NSAccessibilityUnignoredAncestor(accessibleElement);