[PATCH] winevulkan: harden calibrated_timestamps failure paths

[Liam Middlebrook]

Addresses some comments that Zhiyi had made on the initial review thread.

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com>
Signed-off-by: Andy Ritger <aritger(a)nvidia.com>
---
 dlls/winevulkan/vulkan.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index be614f1cef..0b3923dc15 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -1333,6 +1333,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]);
@@ -1366,7 +1368,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++)
     {
-- 
2.26.2

[Joshua Ashton]

Signed-off-by: Joshua Ashton <joshua(a)froggi.es>


On Mon, 3 Aug 2020 at 17:28, Liam Middlebrook <lmiddlebrook(a)nvidia.com> wrote:
> Addresses some comments that Zhiyi had made on the initial review thread.
>
> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com>
> Signed-off-by: Andy Ritger <aritger(a)nvidia.com>
> ---
>  dlls/winevulkan/vulkan.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
> index be614f1cef..0b3923dc15 100644
> --- a/dlls/winevulkan/vulkan.c
> +++ b/dlls/winevulkan/vulkan.c
> @@ -1333,6 +1333,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]);
> @@ -1366,7 +1368,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++)
>      {
> --
> 2.26.2