diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-08-28 16:07:06 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-08-29 12:55:06 +0000 |
| commit | 6f68cada7aa652ef67a4cabf3515619088759d33 (patch) | |
| tree | 51694d337b253406a723f1773e702367fc3dd16e /src/qtwaylandscanner | |
| parent | 5439e06206a2411bd0a7fc45b32ac3e00e92f257 (diff) | |
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>
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index bdcbffa0d..c08c00f4f 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/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"); |