diff options
| author | Marta Lofstedt <[email protected]> | 2015-06-23 13:03:13 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2015-08-07 13:17:07 +0300 |
| commit | 0508861f29f2d3b79fb803353e4ea8ab32654bc4 (patch) | |
| tree | 30609abd9c8649ce4e61a0a62ef4f0b878bcef03 | |
| parent | a0b7c1c86e028309e639368b2b556b755761f68f (diff) | |
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 <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/mesa/main/shaderapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 5b28a2caf3c..f9a7d130f9c 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); |