diff options
| author | Charles Giessen <charles@lunarg.com> | 2022-10-21 23:44:16 +0300 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2022-10-22 00:43:39 +0300 |
| commit | 9cd0dc8cd228d1acd1f3c61ae545640d02318a0c (patch) | |
| tree | dfebc0b17078a5a1aa835ce7a4c39f493d110a0a | |
| parent | ae54ca0d01f0259441a93b7681eebb28102f28d8 (diff) | |
Use correct allocator in debug_utils.c
loader_calloc_with_instance_fallback is used in places where a user can
supply their own allocator, but should default to the allocator used with
the instance otherwise. The issue was that loader_free was being used with
objects created with the instance allocator, but loader_free only takes the
user provided one, leading to leaks.
| -rw-r--r-- | loader/debug_utils.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/loader/debug_utils.c b/loader/debug_utils.c index fc3f9e01f..620f7143c 100644 --- a/loader/debug_utils.c +++ b/loader/debug_utils.c @@ -237,8 +237,8 @@ out: } storage_idx++; } - loader_free(pAllocator, pNewDbgFuncNode); - loader_free(pAllocator, icd_info); + loader_free_with_instance_fallback(pAllocator, inst, pNewDbgFuncNode); + loader_free_with_instance_fallback(pAllocator, inst, icd_info); } return res; @@ -267,7 +267,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_DestroyDebugUtilsMessengerEXT(VkInstance i util_DestroyDebugUtilsMessenger(inst, messenger, pAllocator); - loader_free(pAllocator, icd_info); + loader_free_with_instance_fallback(pAllocator, inst, icd_info); } // This is the instance chain terminator function for SubmitDebugUtilsMessageEXT @@ -432,8 +432,8 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateDebugReportCallbackEXT(VkInstanc uint32_t storage_idx; VkLayerDbgFunctionNode *pNewDbgFuncNode = NULL; - icd_info = ((VkDebugReportCallbackEXT *)loader_calloc(pAllocator, inst->total_icd_count * sizeof(VkDebugReportCallbackEXT), - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT)); + icd_info = ((VkDebugReportCallbackEXT *)loader_calloc_with_instance_fallback( + pAllocator, inst, inst->total_icd_count * sizeof(VkDebugReportCallbackEXT), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT)); if (!icd_info) { res = VK_ERROR_OUT_OF_HOST_MEMORY; goto out; @@ -489,8 +489,8 @@ out: } storage_idx++; } - loader_free(pAllocator, pNewDbgFuncNode); - loader_free(pAllocator, icd_info); + loader_free_with_instance_fallback(pAllocator, inst, pNewDbgFuncNode); + loader_free_with_instance_fallback(pAllocator, inst, icd_info); } return res; @@ -519,7 +519,7 @@ VKAPI_ATTR void VKAPI_CALL terminator_DestroyDebugReportCallbackEXT(VkInstance i util_DestroyDebugReportCallback(inst, callback, pAllocator); - loader_free(pAllocator, icd_info); + loader_free_with_instance_fallback(pAllocator, inst, icd_info); } // This is the instance chain terminator function for DebugReportMessage |