From db0838a117db11152903fc58fcd601cc326318ff Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Tue, 28 Aug 2018 16:29:38 +0200
Subject: [PATCH] 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>
---
 tests/auto/wayland/shared/mocksurface.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/auto/wayland/shared/mocksurface.cpp b/tests/auto/wayland/shared/mocksurface.cpp
index 82ce37acb4c..4de4265d773 100644
--- a/tests/auto/wayland/shared/mocksurface.cpp
+++ b/tests/auto/wayland/shared/mocksurface.cpp
@@ -107,7 +107,9 @@ bool Surface::isMapped() const
 
 Surface *Surface::fromResource(struct ::wl_resource *resource)
 {
-    return static_cast<Surface *>(Resource::fromResource(resource)->surface_object);
+    if (auto *r = Resource::fromResource(resource))
+        return static_cast<Surface *>(r->surface_object);
+    return nullptr;
 }
 
 void Surface::surface_destroy_resource(Resource *)