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

Check for valid QAccessibleInterface before invoking action

Browse Source 
To avoid illegal access, the change ensures that the QAccessibleInterface
is non-null and valid before accessing its QAccessibleActionInterface.

The check for the validity was also added to existing code which
previously only checked for the QAccessibleInterface not being null.

Fixes: QTBUG-132059
Change-Id: I69fc4f9bb052ded8f188032d324666d0c00b9c3c
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 279c891ddf0ad10dd86c8fc836ce385df57593c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a30613197731cd77dd4dac8e3d7d8205718c37f0)
This commit is contained in:
Jan Moeller 2024-12-09 16:13:08 +01:00 committed by Qt Cherry-pick Bot
parent d89bc3c7aa
commit d4e2c76ae8
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/platforms/ios/quiaccessibilityelement.mm
View File

@ -70,7 +70,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (NSString*)accessibilityLabel
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) {
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return @"";
}
@ -82,7 +82,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (NSString*)accessibilityIdentifier
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) {
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return @"";
}
@ -92,7 +92,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (NSString*)accessibilityHint
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) {
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return @"";
}
@ -102,7 +102,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (NSString*)accessibilityValue
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) {
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return @"";
}
@ -127,7 +127,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (CGRect)accessibilityFrame
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) {
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return CGRect();
}
@ -141,7 +141,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
UIAccessibilityTraits traits = UIAccessibilityTraitNone;
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface) {
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return traits;
}
@ -183,6 +183,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (BOOL)accessibilityActivate
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return NO;
}
if (QAccessibleActionInterface *action = iface->actionInterface()) {
if (action->actionNames().contains(QAccessibleActionInterface::pressAction())) {
action->doAction(QAccessibleActionInterface::pressAction());
@ -198,6 +203,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (void)accessibilityIncrement
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return;
}
if (QAccessibleActionInterface *action = iface->actionInterface())
action->doAction(QAccessibleActionInterface::increaseAction());
}
@ -205,6 +215,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (void)accessibilityDecrement
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return;
}
if (QAccessibleActionInterface *action = iface->actionInterface())
action->doAction(QAccessibleActionInterface::decreaseAction());
}
@ -212,6 +227,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QMacAccessibilityElement);
- (BOOL)accessibilityScroll:(UIAccessibilityScrollDirection)direction
{
QAccessibleInterface *iface = QAccessible::accessibleInterface(self.axid);
if (!iface || !iface->isValid()) {
qWarning() << "invalid accessible interface for: " << self.axid;
return NO;
}
QAccessibleActionInterface *action = iface->actionInterface();
if (!action)
return NO;