[Mesa-dev] [PATCH v2] mesa : NULL check InfoLog

[Marta Lofstedt]

From: Marta Lofstedt <marta.lofstedt at intel.com>

When a program is compiled, but linking failed the
sh->InfoLog could be NULL. This is expoloited
by OpenGL ES 3.1 conformance tests.

V2: ralloc_strdup shProg->InfoLog

Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
---
 src/mesa/main/shaderapi.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index a4296ad..bc6625a 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1921,7 +1921,10 @@ _mesa_create_shader_program(struct gl_context* ctx, GLboolean separate,
 #endif
 	 }
 
-	 ralloc_strcat(&shProg->InfoLog, sh->InfoLog);
+         if (sh->InfoLog)
+            ralloc_strcat(&shProg->InfoLog, sh->InfoLog);
+         else
+            ralloc_strdup(ctx, shProg->InfoLog);
       }
 
       delete_shader(ctx, shader);
-- 
1.9.1