Skip to content
Snippets Groups Projects
Commit 4fd8b301 authored by Ian Romanick's avatar Ian Romanick
Browse files

mesa: Ensure that length is set to zero in _mesa_GetProgramBinary


v2: Fix assignment of length.  Noticed by Julien Cristau.

Signed-off-by: default avatarIan Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87516


Reviewed-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Acked-by: default avatarLeight Bade <leith@mapbox.com>
parent 201b9c18
No related branches found
No related tags found
Loading
......@@ -1680,16 +1680,35 @@ _mesa_GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length,
GLenum *binaryFormat, GLvoid *binary)
{
struct gl_shader_program *shProg;
GLsizei length_dummy;
GET_CURRENT_CONTEXT(ctx);
shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetProgramBinary");
if (!shProg)
return;
/* The ARB_get_program_binary spec says:
*
* "If <length> is NULL, then no length is returned."
*
* Ensure that length always points to valid storage to avoid multiple NULL
* pointer checks below.
*/
if (length != NULL)
length = &length_dummy;
/* The ARB_get_program_binary spec says:
*
* "When a program object's LINK_STATUS is FALSE, its program binary
* length is zero, and a call to GetProgramBinary will generate an
* INVALID_OPERATION error.
*/
if (!shProg->LinkStatus) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glGetProgramBinary(program %u not linked)",
shProg->Name);
*length = 0;
return;
}
......@@ -1698,12 +1717,7 @@ _mesa_GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length,
return;
}
/* The ARB_get_program_binary spec says:
*
* "If <length> is NULL, then no length is returned."
*/
if (length != NULL)
*length = 0;
*length = 0;
(void) binaryFormat;
(void) binary;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment