From 403203854d6d67cca021980fe633be86a7dac3f2 Mon Sep 17 00:00:00 2001
From: Charles Giessen <charles@lunarg.com>
Date: Wed, 11 Feb 2026 10:23:57 -0800
Subject: [PATCH] Check for nullptr in loader_unwrap_physical_device

Makes sure nullptr's are checked before dereferencing it to check if the magic value is correct.
---
 loader/loader.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/loader/loader.h b/loader/loader.h
index 0ed8f1690..cdc1ecd0f 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -36,6 +36,9 @@
 LOADER_PLATFORM_THREAD_ONCE_EXTERN_DEFINITION(once_init)
 
 static inline VkPhysicalDevice loader_unwrap_physical_device(VkPhysicalDevice physicalDevice) {
+    if (VK_NULL_HANDLE == physicalDevice) {
+        return VK_NULL_HANDLE;
+    }
     struct loader_physical_device_tramp *phys_dev = (struct loader_physical_device_tramp *)physicalDevice;
     if (PHYS_TRAMP_MAGIC_NUMBER != phys_dev->magic) {
         return VK_NULL_HANDLE;