Mesa (master): mesa: NULL check InfoLog

[Tapani Pälli]

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

Author: Marta Lofstedt <marta.lofstedt at intel.com>
Date:   Tue Jun 23 13:03:13 2015 +0200

mesa: NULL check InfoLog

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

Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/main/shaderapi.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 5b28a2c..f9a7d13 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2033,8 +2033,8 @@ _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);
       }
 
       delete_shader(ctx, shader);