From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 14 Sep 2017 16:47:04 +0000 (+0200)
Subject: radv: fix a potential crash if attachments allocation failed
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e8c7c670340e747e9860fb6cbfc3e89f315fcc2;p=mesa.git

radv: fix a potential crash if attachments allocation failed

Also, it's useless to set the error code twice. Though, we
should probably skip the next commands when the command buffer
is considered invalid.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 068247d04d4..5f22733a7d9 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2771,9 +2771,10 @@ void radv_CmdBeginRenderPass(
 	cmd_buffer->state.framebuffer = framebuffer;
 	cmd_buffer->state.pass = pass;
 	cmd_buffer->state.render_area = pRenderPassBegin->renderArea;
+
 	result = radv_cmd_state_setup_attachments(cmd_buffer, pass, pRenderPassBegin);
 	if (result != VK_SUCCESS)
-		cmd_buffer->record_result = result;
+		return;
 
 	radv_cmd_buffer_set_subpass(cmd_buffer, pass->subpasses, true);
 	assert(cmd_buffer->cs->cdw <= cdw_max);