diff options
author | Marek Olšák <marek.olsak@amd.com> | 2019-11-06 19:10:06 -0500 |
---|---|---|
committer | Marek Olšák <marek.olsak@amd.com> | 2019-11-07 16:07:38 -0500 |
commit | 650ebea5b50378f47a5ec4c437a9c3dd032db984 (patch) | |
tree | 25317e4b8cfaa6e20d47aca7c3cf6b93170798ad | |
parent | d8dbbd7bda07dc63859b26f6df3fa2d1539ae983 (diff) |
shader_runner: fix garbled non-unicode output making piglit-run choke on it
Reviewed-By: Arcady Goldmints-Orlov <agoldmints@igalia.com>
-rw-r--r-- | tests/shaders/shader_runner.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index c53906dfe..fcb95b917 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -789,7 +789,8 @@ specialize_spirv(GLenum target, GLint size; glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &size); - info = malloc(size); + info = malloc(MAX2(size, 1)); + info[0] = 0; glGetShaderInfoLog(shader, size, NULL, info); @@ -882,7 +883,8 @@ link_sso(GLenum target) GLint size; glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); - prog_err_info = malloc(size); + prog_err_info = malloc(MAX2(size, 1)); + prog_err_info[0] = 0; glGetProgramInfoLog(prog, size, NULL, prog_err_info); @@ -1589,7 +1591,8 @@ link_and_use_shaders(void) GLint size; glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); - prog_err_info = malloc(size); + prog_err_info = malloc(MAX2(size, 1)); + prog_err_info[0] = 0; glGetProgramInfoLog(prog, size, NULL, prog_err_info); @@ -1607,7 +1610,8 @@ link_and_use_shaders(void) GLint size; glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size); - prog_err_info = malloc(size); + prog_err_info = malloc(MAX2(size, 1)); + prog_err_info[0] = 0; glGetProgramInfoLog(prog, size, NULL, prog_err_info); } |