From e47474cf91be5fa1d12bf329526d938be8293638 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Thu, 20 Nov 2014 15:30:29 +0200 Subject: 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 --- src/compositor/compositor_api/qwaylandsurface.cpp | 2 ++ 1 file changed, 2 insertions(+) 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(); } -- cgit v1.2.3