From 7a63155052a9362964224039639af0ec88e8def4 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 30 Aug 2020 17:39:43 -0700 Subject: [PATCH] vulkan: Fix memory leaks. Fix warnings reported by Coverity Scan. Resource leak (RESOURCE_LEAK) leaked_storage: Variable info going out of scope leaks the storage it points to. Fixes: 9bc5b2d169d3 ("vulkan: add initial device selection layer. (v6.1)") Signed-off-by: Vinson Lee Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 004119d5b7d4b1679e6dd691e9ab2ab7d65f8516) --- .pick_status.json | 2 +- src/vulkan/device-select-layer/device_select_layer.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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))