KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

propagate errors from parse_generic_attrib_num in parse_attrib_binding (-> don't segfault when you're trying to access invalid generic attributes

This commit is contained in:
Tilman Sauerbeck 2006-06-28 16:26:20 +00:00
parent 7a7aa2aabb
commit 6c33475424
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/shader/arbprogparse.c
View File

@ -1536,7 +1536,10 @@ parse_attrib_binding(GLcontext * ctx, GLubyte ** inst,
case VERTEX_ATTRIB_GENERIC:
{
GLuint attrib;
if (!parse_generic_attrib_num(ctx, inst, Program, &attrib)) {
err = parse_generic_attrib_num(ctx, inst, Program, &attrib);
if (!err) {
*is_generic = 1;
/* Add VERT_ATTRIB_GENERIC0 here because ARB_vertex_program's
* attributes do not alias the conventional vertex
@ -1556,7 +1559,6 @@ parse_attrib_binding(GLcontext * ctx, GLubyte ** inst,
}
}
/* Can this even happen? */
if (err) {
const char *msg = "Bad attribute binding";
_mesa_set_program_error(ctx, Program->Position, msg);