From 39e4fd98ce55a06c813a75f9db8c4e5a06aa25b1 Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Fri, 18 Apr 2025 19:48:53 +0200
Subject: [PATCH] venus: Do not use instance pointer before NULL check

Fixes: a753f50668e ("venus: break up vn_device.c")
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Signed-off-by: Janne Grunau <j@jannau.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34613>
---
 src/virtio/vulkan/vn_instance.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/virtio/vulkan/vn_instance.c b/src/virtio/vulkan/vn_instance.c
index 1315b5309f9..0a8a29984bf 100644
--- a/src/virtio/vulkan/vn_instance.c
+++ b/src/virtio/vulkan/vn_instance.c
@@ -409,12 +409,14 @@ vn_DestroyInstance(VkInstance _instance,
 {
    VN_TRACE_FUNC();
    struct vn_instance *instance = vn_instance_from_handle(_instance);
-   const VkAllocationCallbacks *alloc =
-      pAllocator ? pAllocator : &instance->base.vk.alloc;
+   const VkAllocationCallbacks *alloc = pAllocator;
 
    if (!instance)
       return;
 
+   if (!alloc)
+      alloc = &instance->base.vk.alloc;
+
    if (instance->physical_device.initialized) {
       for (uint32_t i = 0; i < instance->physical_device.device_count; i++)
          vn_physical_device_fini(&instance->physical_device.devices[i]);