From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Wed, 3 May 2017 05:06:01 +0000 (-0700)
Subject: anv: avoid null pointer dereference
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6247b8b41321087a8931becc812819a76fcaebbb;p=mesa.git

anv: avoid null pointer dereference

The application might not give an output structure.

CID: 1405765 (Null pointer dereferences)

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
---

diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 4c930eda1dd..c39cec3800a 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -715,7 +715,8 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR(
    if (external_info && external_info->handleType != 0) {
       switch (external_info->handleType) {
       case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX:
-         external_props->externalMemoryProperties = prime_fd_props;
+         if (external_props)
+            external_props->externalMemoryProperties = prime_fd_props;
          break;
       default:
          /* From the Vulkan 1.0.42 spec: