Mesa (master): radv: don't crash on null swapchain destroy.

Dave Airlie airlied at kemper.freedesktop.org
Tue Nov 15 23:23:23 UTC 2016


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Nov 15 20:11:51 2016 +0000

radv: don't crash on null swapchain destroy.

Just return if the passed in swapchain is NULL.

Fixes: dEQP-VK.wsi.xlib.swapchain.destroy.null_handle

Cc: "13.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/radv_wsi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c
index a946bd4..1f1ab1c 100644
--- a/src/amd/vulkan/radv_wsi.c
+++ b/src/amd/vulkan/radv_wsi.c
@@ -288,6 +288,9 @@ void radv_DestroySwapchainKHR(
 	RADV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
 	const VkAllocationCallbacks *alloc;
 
+	if (!_swapchain)
+		return;
+
 	if (pAllocator)
 		alloc = pAllocator;
 	else




More information about the mesa-commit mailing list