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

Fix potential crash in accessibility key event handling

Browse Source 
Change-Id: Id3eec6c83d7f8ece186e6b5bc02771c00893294b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
This commit is contained in:
Frederik Gladhorn 2013-03-04 23:55:52 +01:00 committed by The Qt Project
parent 56820382f2
commit d8e784f47e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/platformsupport/linuxaccessibility/application.cpp
View File

@ -174,7 +174,7 @@ bool QSpiApplicationAdaptor::eventFilter(QObject *target, QEvent *event)
SLOT(notifyKeyboardListenerError(QDBusError, QDBusMessage)), timeout); SLOT(notifyKeyboardListenerError(QDBusError, QDBusMessage)), timeout);
if (sent) { if (sent) {
//queue the event and send it after callback //queue the event and send it after callback
keyEvents.enqueue(QPair<QObject*, QKeyEvent*> (target, copyKeyEvent(keyEvent))); keyEvents.enqueue(QPair<QPointer<QObject>, QKeyEvent*> (QPointer<QObject>(target), copyKeyEvent(keyEvent)));
#ifdef KEYBOARD_DEBUG #ifdef KEYBOARD_DEBUG
qDebug() << QStringLiteral("Sent key: ") << de.text; qDebug() << QStringLiteral("Sent key: ") << de.text;
#endif #endif
@ -200,11 +200,12 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerCallback(const QDBusMessage&
} }
Q_ASSERT(message.arguments().length() == 1); Q_ASSERT(message.arguments().length() == 1);
if (message.arguments().at(0).toBool() == true) { if (message.arguments().at(0).toBool() == true) {
QPair<QObject*, QKeyEvent*> event = keyEvents.dequeue(); QPair<QPointer<QObject>, QKeyEvent*> event = keyEvents.dequeue();
delete event.second; delete event.second;
} else { } else {
QPair<QObject*, QKeyEvent*> event = keyEvents.dequeue(); QPair<QPointer<QObject>, QKeyEvent*> event = keyEvents.dequeue();
QCoreApplication::postEvent(event.first, event.second); if (event.first)
QCoreApplication::postEvent(event.first.data(), event.second);
} }
} }
@ -212,8 +213,9 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error
{ {
qWarning() << QStringLiteral("QSpiApplication::keyEventError ") << error.name() << error.message(); qWarning() << QStringLiteral("QSpiApplication::keyEventError ") << error.name() << error.message();
while (!keyEvents.isEmpty()) { while (!keyEvents.isEmpty()) {
QPair<QObject*, QKeyEvent*> event = keyEvents.dequeue(); QPair<QPointer<QObject>, QKeyEvent*> event = keyEvents.dequeue();
QCoreApplication::postEvent(event.first, event.second); if (event.first)
QCoreApplication::postEvent(event.first.data(), event.second);
} }
} }

3
src/platformsupport/linuxaccessibility/application_p.h
View File

@ -42,6 +42,7 @@
#ifndef Q_SPI_APPLICATION_H #ifndef Q_SPI_APPLICATION_H
#define Q_SPI_APPLICATION_H #define Q_SPI_APPLICATION_H
#include <QtCore/QPointer>
#include <QtCore/QQueue> #include <QtCore/QQueue>
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QtGui/QAccessibleInterface> #include <QtGui/QAccessibleInterface>
@ -76,7 +77,7 @@ private Q_SLOTS:
private: private:
static QKeyEvent* copyKeyEvent(QKeyEvent*); static QKeyEvent* copyKeyEvent(QKeyEvent*);
QQueue<QPair<QObject*, QKeyEvent*> > keyEvents; QQueue<QPair<QPointer<QObject>, QKeyEvent*> > keyEvents;
QDBusConnection dbusConnection; QDBusConnection dbusConnection;
}; };