From cbc9896264499615fc264836d2cfbcbcc3dd2ae5 Mon Sep 17 00:00:00 2001
From: Simon Perretta <simon.perretta@imgtec.com>
Date: Thu, 12 Sep 2024 12:17:48 +0100
Subject: [PATCH] pvr: fix GetInstanceProcAddr ubsan warning when _instance ==
 NULL

Signed-off-by: Simon Perretta <simon.perretta@imgtec.com>
Acked-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32258>
---
 src/imagination/vulkan/pvr_device.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c
index ea9acf3ee6a..c1c70900d0c 100644
--- a/src/imagination/vulkan/pvr_device.c
+++ b/src/imagination/vulkan/pvr_device.c
@@ -1283,8 +1283,14 @@ void pvr_GetPhysicalDeviceMemoryProperties2(
 PFN_vkVoidFunction pvr_GetInstanceProcAddr(VkInstance _instance,
                                            const char *pName)
 {
-   PVR_FROM_HANDLE(pvr_instance, instance, _instance);
-   return vk_instance_get_proc_addr(&instance->vk,
+   const struct vk_instance *vk_instance = NULL;
+
+   if (_instance != NULL) {
+      PVR_FROM_HANDLE(pvr_instance, instance, _instance);
+      vk_instance = &instance->vk;
+   }
+
+   return vk_instance_get_proc_addr(vk_instance,
                                     &pvr_instance_entrypoints,
                                     pName);
 }