wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Fix potential memory leak in vkd3d_create_vk_device().

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia
2018-09-28 12:16:43 +02:00
committed by Alexandre Julliard
parent 6f73364634
commit f1c967ab38
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d/device.c
View File

@ -1025,7 +1025,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info)))) if (!(queue_info = vkd3d_calloc(queue_family_count, sizeof(*queue_info))))
{ {
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
goto fail; goto done;
} }
direct_queue_family_index = ~0u; direct_queue_family_index = ~0u;
@ -1062,13 +1062,13 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
{ {
FIXME("Could not find a suitable queue family for a direct command queue.\n"); FIXME("Could not find a suitable queue family for a direct command queue.\n");
hr = E_FAIL; hr = E_FAIL;
goto fail; goto done;
} }
if (copy_queue_family_index == ~0u) if (copy_queue_family_index == ~0u)
{ {
FIXME("Could not find a suitable queue family for a copy command queue.\n"); FIXME("Could not find a suitable queue family for a copy command queue.\n");
hr = E_FAIL; hr = E_FAIL;
goto fail; goto done;
} }
if (compute_queue_family_index == ~0u) if (compute_queue_family_index == ~0u)
{ {
@ -1085,12 +1085,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features));
device->vk_physical_device = physical_device; device->vk_physical_device = physical_device;
if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count)))
goto fail; goto done;
if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions))))
{ {
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
goto fail; goto done;
} }
/* Create device */ /* Create device */
@ -1114,7 +1114,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
if (vr < 0) if (vr < 0)
{ {
ERR("Failed to create Vulkan device, vr %d.\n", vr); ERR("Failed to create Vulkan device, vr %d.\n", vr);
return hresult_from_vk_result(vr); hr = hresult_from_vk_result(vr);
goto done;
} }
if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device))) if (FAILED(hr = vkd3d_load_vk_device_procs(&device->vk_procs, vk_procs, vk_device)))
@ -1122,7 +1123,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
ERR("Failed to load device procs, hr %#x.\n", hr); ERR("Failed to load device procs, hr %#x.\n", hr);
if (device->vk_procs.vkDestroyDevice) if (device->vk_procs.vkDestroyDevice)
device->vk_procs.vkDestroyDevice(vk_device, NULL); device->vk_procs.vkDestroyDevice(vk_device, NULL);
goto fail; goto done;
} }
device->vk_device = vk_device; device->vk_device = vk_device;
@ -1132,12 +1133,12 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
{ {
ERR("Failed to create queues, hr %#x.\n", hr); ERR("Failed to create queues, hr %#x.\n", hr);
device->vk_procs.vkDestroyDevice(vk_device, NULL); device->vk_procs.vkDestroyDevice(vk_device, NULL);
goto fail; goto done;
} }
TRACE("Created Vulkan device %p.\n", vk_device); TRACE("Created Vulkan device %p.\n", vk_device);
fail: done:
if (queue_properties) if (queue_properties)
vkd3d_free(queue_properties); vkd3d_free(queue_properties);
if (queue_info) if (queue_info)