diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-08-28 16:29:38 +0200 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2018-08-29 12:55:22 +0000 |
commit | 2af5dce3e7ea3e341720c4212e1d0a12ca68f41c (patch) | |
tree | 9bd99396a96089e29efba439f75115db0c6d9a4c /src/compositor/compositor_api/qwaylandsurface.cpp | |
parent | 6f68cada7aa652ef67a4cabf3515619088759d33 (diff) |
Compositor: Fix nullptr dereferences in fromResource functions
If there was no resource for the given wl_resource*, don't try to dereference
it.
Change-Id: I3a27a5805699148bb26029e8b4179042c3c1117a
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandsurface.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 9783b5848..632b1757f 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -748,7 +748,9 @@ QList<QWaylandView *> QWaylandSurface::views() const */ QWaylandSurface *QWaylandSurface::fromResource(::wl_resource *res) { - return static_cast<QWaylandSurfacePrivate *>(QWaylandSurfacePrivate::Resource::fromResource(res)->surface_object)->q_func(); + if (auto *r = QWaylandSurfacePrivate::Resource::fromResource(res)) + return static_cast<QWaylandSurfacePrivate *>(r->surface_object)->q_func(); + return nullptr; } /*! |