From 73b3b1f847e915be4913048080146f440869f41e Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Wed, 4 Dec 2013 17:27:01 +0200
Subject: QtCompositor: fix null pointer reference

Don't call a method on a null pointer in QWaylandInputPanel

Change-Id: I1e32a84323a06267bd5e3a4aee6c0a94c98b8df3
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
---
 src/compositor/compositor_api/qwaylandinputpanel.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/compositor/compositor_api/qwaylandinputpanel.cpp b/src/compositor/compositor_api/qwaylandinputpanel.cpp
index 030014729..03084262c 100644
--- a/src/compositor/compositor_api/qwaylandinputpanel.cpp
+++ b/src/compositor/compositor_api/qwaylandinputpanel.cpp
@@ -75,7 +75,10 @@ QWaylandSurface *QWaylandInputPanel::focus() const
 {
     Q_D(const QWaylandInputPanel);
 
-    return d->inputPanel->focus()->waylandSurface();
+    QtWayland::Surface *surface = d->inputPanel->focus();
+    if (surface)
+        return surface->waylandSurface();
+    return 0;
 }
 
 bool QWaylandInputPanel::visible() const
-- 
cgit v1.2.3