From 3c4ea05c754bfdc7e353f60e3bf3498867c4b0ea Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Tue, 28 Aug 2018 16:07:06 +0200
Subject: [PATCH] Scanner: Don't crash when calling fromResource with nullptr

Change-Id: I85c17e50cf917a51e74fa03fcdc647def6e4bdfd
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
---
 src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
index bdcbffa0d3c..c08c00f4fc3 100644
--- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
@@ -806,6 +806,8 @@ bool Scanner::process()
 
             printf("    %s::Resource *%s::Resource::fromResource(struct ::wl_resource *resource)\n", interfaceName, interfaceName);
             printf("    {\n");
+            printf("        if (Q_UNLIKELY(!resource))\n");
+            printf("            return nullptr;\n");
             printf("        if (wl_resource_instance_of(resource, &::%s_interface, %s))\n",  interfaceName, interfaceMember.constData());
             printf("            return static_cast<Resource *>(resource->data);\n");
             printf("        return nullptr;\n");