Mesa (master): radv: Fix possible invalid free of dynamic descriptors

[Bas Nieuwenhuizen]

Module: Mesa
Branch: master
Commit: 4d5c0c189d43e7ebf880d7994a09118051d69e97
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d5c0c189d43e7ebf880d7994a09118051d69e97

Author: Alex Smith <asmith at feralinteractive.com>
Date:   Wed Jul 12 11:14:21 2017 +0100

radv: Fix possible invalid free of dynamic descriptors

This free was left in after dynamic descriptors were changed to not be
allocated separately from the descriptor set, and can cause a crash.

Fixes: 39644fa40a3 ("radv: Don't allocate dynamic descriptors separately")
Signed-off-by: Alex Smith <asmith at feralinteractive.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_descriptor_set.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index ec7fd3d8cc..b482843539 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -317,7 +317,6 @@ radv_descriptor_set_create(struct radv_device *device,
 			}
 
 			if (pool->size - offset < layout_size) {
-				vk_free2(&device->alloc, NULL, set->dynamic_descriptors);
 				vk_free2(&device->alloc, NULL, set);
 				return vk_error(VK_ERROR_OUT_OF_POOL_MEMORY_KHR);
 			}