From e315917554a3b5f8d48e48f1f5209d5e47242875 Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Mon, 21 Jul 2025 10:16:20 -0700
Subject: [PATCH] gfxstream: null-check in vulkan-mapper

Fixes an observed crash.

Reviewed-by: Jason Macnak <jmacnak@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36264>
---
 src/gfxstream/guest/vulkan-mapper/GfxStreamVulkanMapper.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gfxstream/guest/vulkan-mapper/GfxStreamVulkanMapper.cpp b/src/gfxstream/guest/vulkan-mapper/GfxStreamVulkanMapper.cpp
index 2290f06a326..332e5ebca41 100644
--- a/src/gfxstream/guest/vulkan-mapper/GfxStreamVulkanMapper.cpp
+++ b/src/gfxstream/guest/vulkan-mapper/GfxStreamVulkanMapper.cpp
@@ -207,7 +207,9 @@ GfxStreamVulkanMapper* GfxStreamVulkanMapper::getInstance(std::optional<DeviceId
             return nullptr;
         }
 
-        setenv(VK_ICD_FILENAMES, driver, 1);
+        if (driver) {
+            setenv(VK_ICD_FILENAMES, driver, 1);
+        }
     }
 
     return sVkMapper.get();