summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2014-11-20 15:30:29 +0200
committerGiulio Camuffo <giulio.camuffo@jollamobile.com>2014-11-20 17:13:40 +0100
commite47474cf91be5fa1d12bf329526d938be8293638 (patch)
treefaae778858a724c3cf77d0293e441d5e140ab676 /src
parent1aca236eba078034edb05a1a08cef0cf4f736340 (diff)
Don't access a dangling pointer
The surface's resource may have been destroyed, return a null client in that case. Change-Id: I3d7e0f0e94008e003e43f1987e6560dd73f5c5db Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index 205cea7a3..54b38109f 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -92,6 +92,8 @@ QWaylandSurface::~QWaylandSurface()
WaylandClient *QWaylandSurface::client() const
{
Q_D(const QWaylandSurface);
+ if (d->isDestroyed())
+ return Q_NULLPTR;
return d->resource()->client();
}