diff options
| author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2016-04-25 15:24:48 -0700 |
|---|---|---|
| committer | Louai Al-Khanji <louai.al-khanji@qt.io> | 2016-04-28 20:43:31 +0000 |
| commit | 3004d09437aca95544be88f60bae9b3f1d412a63 (patch) | |
| tree | baf2b90e4779bdda7a1ca500efa1c4affc4b42c5 | |
| parent | 15cd497e00b62466dafa5b8c33af40e9a46696df (diff) | |
QWaylandQuickItem: Fix potential null-pointer dereference
Change-Id: Ibe1b32f3bc55854b23fafdb9cd2d50754b193a87
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index ded65e87f..d6879dc07 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -733,7 +733,10 @@ QVariant QWaylandQuickItem::inputMethodQuery(Qt::InputMethodQuery query, QVarian if (query == Qt::ImEnabled) return QVariant((flags() & ItemAcceptsInputMethod) != 0); - return d->oldSurface->inputMethodControl()->inputMethodQuery(query, argument); + if (d->oldSurface) + return d->oldSurface->inputMethodControl()->inputMethodQuery(query, argument); + + return QVariant(); } #endif |