[Mesa-dev] [PATCH] mesa: avoid segfault in GetProgramPipelineInfoLog when no length

[Brian Paul]

On 02/12/2016 12:25 PM, Ilia Mirkin wrote:
> If there is no pipe info log, we would unconditionally deref length,
> which was only optionally there. _mesa_copy_string handles the source
> being null, as well as the length, so may as well just always call it.
>
> Fixes a segfault in
>
> dEQP-GLES31.functional.state_query.program_pipeline.info_log
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>   src/mesa/main/pipelineobj.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
> index 0e4a0af..af17be2 100644
> --- a/src/mesa/main/pipelineobj.c
> +++ b/src/mesa/main/pipelineobj.c
> @@ -964,8 +964,5 @@ _mesa_GetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize,
>         return;
>      }
>
> -   if (pipe->InfoLog)
> -      _mesa_copy_string(infoLog, bufSize, length, pipe->InfoLog);
> -   else
> -      *length = 0;
> +   _mesa_copy_string(infoLog, bufSize, length, pipe->InfoLog);
>   }
>

Reviewed-by: Brian Paul <brianp at vmware.com>