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

[Matt Turner]

On Tue, Jun 23, 2015 at 4:03 AM, Marta Lofstedt
<marta.lofstedt at linux.intel.com> wrote:
> 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.
>
> Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.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 a4296ad..c783c69 100644
> --- a/src/mesa/main/shaderapi.c
> +++ b/src/mesa/main/shaderapi.c
> @@ -1920,8 +1920,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);

Wrong indentation on this line.

Surely just not writing to the info log isn't the right fix? If it's
null, shouldn't we instead ralloc_strdup() the string?