From: Tom Stellard <tstellar@gmail.com>
Date: Tue, 28 Sep 2010 16:21:05 +0000 (-0700)
Subject: r300/compiler: Fix segfault in error path
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d40ff5510ce60c5bc9db238e2650fa79104d84e9;p=mesa.git

r300/compiler: Fix segfault in error path

https://bugs.freedesktop.org/show_bug.cgi?id=30415

NOTE: This is a candidate for the 7.9 branch.
---

diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
index bad16846964..407d92531a5 100644
--- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
+++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
@@ -250,7 +250,7 @@ static void emit_paired(struct r300_fragment_program_compiler *c, struct rc_pair
 	if (inst->RGB.OutputWriteMask || inst->Alpha.OutputWriteMask || inst->Alpha.DepthWriteMask) {
 		code->inst[ip].inst0 = R500_INST_TYPE_OUT;
 		if (inst->WriteALUResult) {
-			error("%s: cannot write output and ALU result at the same time");
+			error("Cannot write output and ALU result at the same time");
 			return;
 		}
 	} else {