From 4ee0833a3cdb834aa71c2b77ce5b01235b7b7170 Mon Sep 17 00:00:00 2001
From: jpr42 <github@jpr.mozmail.com>
Date: Fri, 11 Apr 2025 23:20:56 -0700
Subject: [PATCH] Fix UBSAN error

Calling memcpy with either src or dst as nullptr is undefined
even if the count is 0.

Discovered by running tests with -fsanitize=undefined

safe_struct.extension_add_remove specifcially
---
 CMakeLists.txt                                  | 17 ++++++++++++++++-
 include/vulkan/utility/vk_safe_struct_utils.hpp |  4 +++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e84121..fea5be3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,22 @@ add_subdirectory(scripts)
 
 find_package(VulkanHeaders CONFIG)
 
+option(VUL_ENABLE_ASAN "Use address sanitization")
+if (VUL_ENABLE_ASAN)
+    add_compile_options(-fsanitize=address)
+    if (NOT MSVC)
+        add_link_options(-fsanitize=address)
+    endif()
+endif()
+
+option(VUL_ENABLE_UBSAN "Use undefined behavior sanitization")
+if (VUL_ENABLE_UBSAN)
+    if (NOT MSVC)
+        add_compile_options(-fsanitize=undefined)
+        add_link_options(-fsanitize=undefined)
+    endif()
+endif()
+
 add_subdirectory(src)
 add_subdirectory(include)
 
@@ -37,7 +53,6 @@ if (PROJECT_IS_TOP_LEVEL)
 endif()
 
 option(VUL_ENABLE_INSTALL "Enable install" ${PROJECT_IS_TOP_LEVEL})
-
 if (VUL_ENABLE_INSTALL)
 
     include(GNUInstallDirs)
diff --git a/include/vulkan/utility/vk_safe_struct_utils.hpp b/include/vulkan/utility/vk_safe_struct_utils.hpp
index a770298..ff87859 100644
--- a/include/vulkan/utility/vk_safe_struct_utils.hpp
+++ b/include/vulkan/utility/vk_safe_struct_utils.hpp
@@ -83,7 +83,9 @@ bool AddExtension(CreateInfo& ci, const char* extension_name) {
         return false;
     }
     char** exts = new char*[ci.enabledExtensionCount + 1];
-    memcpy(exts, ci.ppEnabledExtensionNames, sizeof(char*) * ci.enabledExtensionCount);
+    if (ci.ppEnabledExtensionNames) {
+        memcpy(exts, ci.ppEnabledExtensionNames, sizeof(char*) * ci.enabledExtensionCount);
+    }
     exts[ci.enabledExtensionCount] = SafeStringCopy(extension_name);
     delete[] ci.ppEnabledExtensionNames;
     ci.ppEnabledExtensionNames = exts;