asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Always init DEBUG_UTILS_MESSENGER_CREATE_INFO structure if DEBUG_UTILS functions are used. Add temporary variables to fix potential use-after-free.

Browse source
This commit is contained in:
bruvzg 2021-02-02 11:27:47 +02:00
parent b24c24f64b
commit 7be7e87ff3
No known key found for this signature in database
GPG key ID: 009E1BFE42239B95
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/vulkan/vulkan_context.cpp
View file

@ -331,7 +331,7 @@ Error VulkanContext::_create_physical_device() {
* function to register the final callback. * function to register the final callback.
*/ */
VkDebugUtilsMessengerCreateInfoEXT dbg_messenger_create_info; VkDebugUtilsMessengerCreateInfoEXT dbg_messenger_create_info;
if (use_validation_layers) { if (enabled_debug_utils) {
// VK_EXT_debug_utils style // VK_EXT_debug_utils style
dbg_messenger_create_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT; dbg_messenger_create_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
dbg_messenger_create_info.pNext = nullptr; dbg_messenger_create_info.pNext = nullptr;
@ -1593,7 +1593,8 @@ void VulkanContext::command_begin_label(VkCommandBuffer p_command_buffer, String
VkDebugUtilsLabelEXT label; VkDebugUtilsLabelEXT label;
label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
label.pNext = nullptr; label.pNext = nullptr;
label.pLabelName = p_label_name.utf8().get_data(); CharString label_name = p_label_name.utf8();
label.pLabelName = label_name.get_data();
label.color[0] = p_color[0]; label.color[0] = p_color[0];
label.color[1] = p_color[1]; label.color[1] = p_color[1];
label.color[2] = p_color[2]; label.color[2] = p_color[2];
@ -1608,7 +1609,8 @@ void VulkanContext::command_insert_label(VkCommandBuffer p_command_buffer, Strin
VkDebugUtilsLabelEXT label; VkDebugUtilsLabelEXT label;
label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT; label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
label.pNext = nullptr; label.pNext = nullptr;
label.pLabelName = p_label_name.utf8().get_data(); CharString label_name = p_label_name.utf8();
label.pLabelName = label_name.get_data();
label.color[0] = p_color[0]; label.color[0] = p_color[0];
label.color[1] = p_color[1]; label.color[1] = p_color[1];
label.color[2] = p_color[2]; label.color[2] = p_color[2];