mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-04 05:36:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aux/vk: Fix use free of stack variable and use correct return

Browse source
This commit is contained in:
Jakob Bornecrantz 2021-04-15 17:35:16 +01:00
parent 05f14461a3
commit 26756cc52d
1 changed files with 15 additions and 10 deletions

25
src/xrt/auxiliary/vk/vk_helpers.c
View file

@ -1062,21 +1062,26 @@ vk_check_extension(struct vk_bundle *vk, VkExtensionProperties *props, uint32_t
return false;
}
static bool
static VkResult
vk_get_device_ext_props(struct vk_bundle *vk,
VkPhysicalDevice physical_device,
VkExtensionProperties **props,
uint32_t *num_props)
VkExtensionProperties **out_props,
uint32_t *out_num_props)
{
VkResult res = vk->vkEnumerateDeviceExtensionProperties(physical_device, NULL, num_props, NULL);
uint32_t num_props = 0;
VkResult res = vk->vkEnumerateDeviceExtensionProperties(physical_device, NULL, &num_props, NULL);
vk_check_error("vkEnumerateDeviceExtensionProperties", res, false);
*props = U_TYPED_ARRAY_CALLOC(VkExtensionProperties, *num_props);
VkExtensionProperties *props = U_TYPED_ARRAY_CALLOC(VkExtensionProperties, num_props);
res = vk->vkEnumerateDeviceExtensionProperties(physical_device, NULL, num_props, *props);
res = vk->vkEnumerateDeviceExtensionProperties(physical_device, NULL, &num_props, props);
vk_check_error_with_free("vkEnumerateDeviceExtensionProperties", res, false, props);
return true;
// Check above returns on failure.
*out_props = props;
*out_num_props = num_props;
return VK_SUCCESS;
}
static bool
@ -1089,9 +1094,9 @@ vk_build_device_extensions(struct vk_bundle *vk,
const char ***out_device_extensions,
uint32_t *out_num_device_extensions)
{
VkExtensionProperties *props;
uint32_t num_props;
if (!vk_get_device_ext_props(vk, physical_device, &props, &num_props)) {
VkExtensionProperties *props = NULL;
uint32_t num_props = 0;
if (vk_get_device_ext_props(vk, physical_device, &props, &num_props) != VK_SUCCESS) {
return false;
}