diff --git a/.pick_status.json b/.pick_status.json index 47e47c8bb61..92da6a19b61 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -526,7 +526,7 @@ "description": "vulkan: Fix memory leaks.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "9bc5b2d169d3a3c9d52fc30987eaba52e3b7dc00" }, diff --git a/src/vulkan/device-select-layer/device_select_layer.c b/src/vulkan/device-select-layer/device_select_layer.c index 7bec8890344..3a5981063c8 100644 --- a/src/vulkan/device-select-layer/device_select_layer.c +++ b/src/vulkan/device-select-layer/device_select_layer.c @@ -137,14 +137,17 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate PFN_vkCreateInstance fpCreateInstance = (PFN_vkCreateInstance)info->GetInstanceProcAddr(NULL, "vkCreateInstance"); if (fpCreateInstance == NULL) { + free(info); return VK_ERROR_INITIALIZATION_FAILED; } chain_info->u.pLayerInfo = chain_info->u.pLayerInfo->pNext; VkResult result = fpCreateInstance(pCreateInfo, pAllocator, pInstance); - if (result != VK_SUCCESS) + if (result != VK_SUCCESS) { + free(info); return result; + } for (unsigned i = 0; i < pCreateInfo->enabledExtensionCount; i++) { if (!strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))