fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 01:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: fix a memleak if the physical device initialization failed

Browse source 
The disk cache object should be freed.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4806>
This commit is contained in:
Samuel Pitoiset 2020-04-29 14:03:24 +02:00 • committed by Marge Bot
parent b867a677e9
commit 9c62e63aca
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/amd/vulkan/radv_device.c
View file

@ -297,7 +297,7 @@ radv_physical_device_init(struct radv_physical_device *device,
if (!device->ws) {
result = vk_error(instance, VK_ERROR_INCOMPATIBLE_DRIVER);
goto fail;
goto fail_fd;
}
if (drm_device && instance->enabled_extensions.KHR_display) {
@ -328,10 +328,9 @@ radv_physical_device_init(struct radv_physical_device *device,
device->rad_info.name);
if (radv_device_get_cache_uuid(device->rad_info.family, device->cache_uuid)) {
device->ws->destroy(device->ws);
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"cannot generate UUID");
goto fail;
goto fail_wsi;
}
/* These flags affect shader compilation. */
@ -399,14 +398,17 @@ radv_physical_device_init(struct radv_physical_device *device,
*/
result = radv_init_wsi(device);
if (result != VK_SUCCESS) {
device->ws->destroy(device->ws);
vk_error(instance, result);
goto fail;
goto fail_disk_cache;
}
return VK_SUCCESS;
fail:
fail_disk_cache:
disk_cache_destroy(device->disk_cache);
fail_wsi:
device->ws->destroy(device->ws);
fail_fd:
close(fd);
if (master_fd != -1)
close(master_fd);