From c47b289972a6c5ca0e30ff5618418e5ca91bd1ec Mon Sep 17 00:00:00 2001 From: Török Edvin Date: Sat, 4 Sep 2010 13:48:24 +0300 Subject: glsl2: check for _NumLinkedShaders being 0 Otherwise spring 0.82+.4.0 crashes when starting a game because prog->_LinkedShaders[0] is NULL. This also fixes piglit test cases glsl-link-empty-prog-0[12]. --- src/glsl/linker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index e0823c3af42..02c7c298783 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1476,7 +1476,7 @@ link_shaders(GLcontext *ctx, struct gl_shader_program *prog) assign_uniform_locations(prog); - if (prog->_LinkedShaders[0]->Type == GL_VERTEX_SHADER) { + if (prog->_NumLinkedShaders && prog->_LinkedShaders[0]->Type == GL_VERTEX_SHADER) { /* FINISHME: The value of the max_attribute_index parameter is * FINISHME: implementation dependent based on the value of * FINISHME: GL_MAX_VERTEX_ATTRIBS. GL_MAX_VERTEX_ATTRIBS must be -- cgit v1.2.3