From ba78e083941442f6a8a95f2bf4172c41e028c123 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 12 Jul 2018 13:30:15 +0100 Subject: [PATCH] Fix crash if VkImportMemoryWin32HandleInfoKHR::name is NULL --- renderdoc/driver/vulkan/vk_serialise.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index 77afb5aab..2012c2496 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -3168,13 +3168,13 @@ void DoSerialise(SerialiserType &ser, VkImportMemoryWin32HandleInfoKHR &el) } { - std::string name = StringFormat::Wide2UTF8(std::wstring(el.name)); + std::string name = el.name ? StringFormat::Wide2UTF8(std::wstring(el.name)) : ""; ser.Serialise("name", name); // we don't expose UTF82Wide on all platforms, but as above this struct won't be valid anyway if(ser.IsReading()) - el.name = L"???"; + el.name = NULL; } }