winevulkan: Harden calibrated_timestamps failure paths.

Addresses some comments that Zhiyi had made on the initial review thread. Signed-off-by: Liam Middlebrook <lmiddlebrook@nvidia.com> Signed-off-by: Andy Ritger <aritger@nvidia.com> Signed-off-by: Joshua Ashton <joshua@froggi.es> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winevulkan: Harden calibrated_timestamps failure paths.
18d7bc98 · Liam Middlebrook · Alexandre Julliard · 91625e43 · 18d7bc98
Commit 18d7bc98 authored Aug 03, 2020 by Liam Middlebrook Committed by Alexandre Julliard Aug 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

vulkan.c dlls/winevulkan/vulkan.c +5 -0

No files found.
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1335,6 +1335,8 @@ VkResult WINAPI wine_vkGetCalibratedTimestampsEXT(VkDevice device,
    }

    res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->device, timestamp_count, host_timestamp_infos, timestamps, max_deviation);
+    if (res != VK_SUCCESS)
+        return res;

    for (i = 0; i < timestamp_count; i++)
        timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]);
@@ -1368,7 +1370,10 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe

    res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, host_time_domains);
    if (res != VK_SUCCESS)
+    {
+        heap_free(host_time_domains);
        return res;
+    }

    for (i = 0; i < host_time_domain_count; i++)
    {