AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accessibility Linux: Prevent access to invalid interfaces

Browse Source 
Especially with the newer QML accessibility we
can end up with events for objects that cannot
instantiate a QAccessibleInterface.
Let's not crash in that case.

Change-Id: Ie5d38315f32d30540eb4adcb74a7b3bfa667f03f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Frederik Gladhorn 2012-12-11 20:31:00 +01:00 committed by The Qt Project
parent 3e3451f429
commit 51cf4215dc
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/platformsupport/linuxaccessibility/atspiadaptor.cpp
View File

@ -971,7 +971,10 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
case QAccessible::TextUpdated: { case QAccessible::TextUpdated: {
if (sendObject || sendObject_text_changed) { if (sendObject || sendObject_text_changed) {
QAIPointer iface = QAIPointer(event->accessibleInterface()); QAIPointer iface = QAIPointer(event->accessibleInterface());
Q_ASSERT(iface->textInterface()); if (!iface || !iface->textInterface()) {
qAtspiDebug() << "Received text event for invalid interface.";
return;
}
QString path = pathForInterface(iface); QString path = pathForInterface(iface);
int changePosition = 0; int changePosition = 0;
@ -1026,8 +1029,8 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
case QAccessible::TextCaretMoved: { case QAccessible::TextCaretMoved: {
if (sendObject || sendObject_text_caret_moved) { if (sendObject || sendObject_text_caret_moved) {
QAIPointer iface = QAIPointer(event->accessibleInterface()); QAIPointer iface = QAIPointer(event->accessibleInterface());
if (!iface->textInterface()) { if (!iface || !iface->textInterface()) {
qWarning() << "Sending TextCaretMoved from object that does not implement text interface: " << iface << iface->object(); qWarning() << "Sending TextCaretMoved from object that does not implement text interface: " << iface;
return; return;
} }
@ -1054,7 +1057,11 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
case QAccessible::ValueChanged: { case QAccessible::ValueChanged: {
if (sendObject || sendObject_value_changed || sendObject_property_change_accessible_value) { if (sendObject || sendObject_value_changed || sendObject_property_change_accessible_value) {
QAIPointer iface = QAIPointer(event->accessibleInterface()); QAIPointer iface = QAIPointer(event->accessibleInterface());
Q_ASSERT(iface->valueInterface()); if (!iface || !iface->valueInterface()) {
qWarning() << "ValueChanged event from invalid accessible: " << iface;
return;
}
QString path = pathForInterface(iface); QString path = pathForInterface(iface);
QVariantList args = packDBusSignalArguments(QLatin1String("accessible-value"), 0, 0, variantForPath(path)); QVariantList args = packDBusSignalArguments(QLatin1String("accessible-value"), 0, 0, variantForPath(path));
sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT), sendDBusSignal(path, QLatin1String(ATSPI_DBUS_INTERFACE_EVENT_OBJECT),
@ -1064,6 +1071,10 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
} }
case QAccessible::Selection: { case QAccessible::Selection: {
QAIPointer iface = QAIPointer(event->accessibleInterface()); QAIPointer iface = QAIPointer(event->accessibleInterface());
if (!iface) {
qWarning() << "Selection event from invalid accessible.";
return;
}
QString path = pathForInterface(iface); QString path = pathForInterface(iface);
int selected = iface->state().selected ? 1 : 0; int selected = iface->state().selected ? 1 : 0;
QVariantList stateArgs = packDBusSignalArguments(QLatin1String("selected"), selected, 0, variantForPath(path)); QVariantList stateArgs = packDBusSignalArguments(QLatin1String("selected"), selected, 0, variantForPath(path));
@ -1077,11 +1088,15 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
QAccessible::State stateChange = static_cast<QAccessibleStateChangeEvent*>(event)->changedStates(); QAccessible::State stateChange = static_cast<QAccessibleStateChangeEvent*>(event)->changedStates();
if (stateChange.checked) { if (stateChange.checked) {
QAIPointer iface = QAIPointer(event->accessibleInterface()); QAIPointer iface = QAIPointer(event->accessibleInterface());
if (!iface) {
qWarning() << "StateChanged event from invalid accessible.";
return;
}
int checked = iface->state().checked; int checked = iface->state().checked;
notifyStateChange(iface, QLatin1String("checked"), checked); notifyStateChange(iface, QLatin1String("checked"), checked);
} else if (stateChange.active) { } else if (stateChange.active) {
QAIPointer iface = QAIPointer(event->accessibleInterface()); QAIPointer iface = QAIPointer(event->accessibleInterface());
if (!(iface->role() == QAccessible::Window && (sendWindow || sendWindow_activate))) if (!iface || !(iface->role() == QAccessible::Window && (sendWindow || sendWindow_activate)))
return; return;
QString windowTitle = iface->text(QAccessible::Name); QString windowTitle = iface->text(QAccessible::Name);
QDBusVariant data; QDBusVariant data;