diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-04 15:38:05 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-09 21:32:19 +0200 |
| commit | 4746bb904bf6841137d5b50357bf79c852bf5d06 (patch) | |
| tree | 846ddbcb6fb083b5fb127ad55f5cf7ad501111e0 | |
| parent | 30f99d80d809e373c3a39b49a4c4c8cb10f1f3cd (diff) | |
Null check result of consuming mailbox texture
Fixes: QTBUG-76913
Change-Id: Ib036121f366d037d507f59bf31c3ab9c79bfea5e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/core/compositor/compositor_resource_tracker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp index 73242c693..741c2717c 100644 --- a/src/core/compositor/compositor_resource_tracker.cpp +++ b/src/core/compositor/compositor_resource_tracker.cpp @@ -174,7 +174,8 @@ quint32 CompositorResourceTracker::consumeMailbox(const gpu::MailboxHolder &mail DCHECK(mailboxManager); if (mailboxHolder.sync_token.HasData()) mailboxManager->PullTextureUpdates(mailboxHolder.sync_token); - return service_id(mailboxManager->ConsumeTexture(mailboxHolder.mailbox)); + gpu::TextureBase *tex = mailboxManager->ConsumeTexture(mailboxHolder.mailbox); + return tex ? service_id(tex) : 0; #else NOTREACHED(); #endif // QT_CONFIG(OPENGL) |