diff options
| author | Ilia Mirkin <[email protected]> | 2016-02-12 14:23:30 -0500 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2016-02-12 18:22:50 -0500 |
| commit | f56b5de877c165fd89fbc670c4bd64f4f9637643 (patch) | |
| tree | c9c31a5a13c6e5035ea3633b76bfefa1decbba1b /src/mesa/main/pipelineobj.c | |
| parent | f82ff6207ca98c153d5dc24319f86146d55ae230 (diff) | |
mesa: avoid segfault in GetProgramPipelineInfoLog when no length
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/pipelineobj.c')
| -rw-r--r-- | src/mesa/main/pipelineobj.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 0e4a0af0b0f..af17be2a3f4 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); } |