From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Fri, 14 Jul 2017 13:10:58 +0000 (+0200)
Subject: radeonsi: bail out instead of crashing if the main shader part failed to compile
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06e20c4b8c59104b789981e6d98f3d13bfa8d69f;p=mesa.git

radeonsi: bail out instead of crashing if the main shader part failed to compile

Reviewed: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 4a36923ae8c..35bdd85afcf 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -7379,6 +7379,9 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
 		 * the previous shader stage.
 		 */
 
+		if (!mainp)
+			return -1;
+
 		/* Copy the compiled TGSI shader data over. */
 		shader->is_binary_shared = true;
 		shader->binary = mainp->binary;