From: Tilman Sauerbeck <tilman@freedesktop.org>
Date: Wed, 28 Jun 2006 16:26:20 +0000 (+0000)
Subject: propagate errors from parse_generic_attrib_num in parse_attrib_binding (-> don't... 
X-Git-Tag: 062012170305~20822
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c334754244f11a1bfc01b9009c55ee5916f7dc7;p=profile%2Fivi%2Fmesa.git

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

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 66ea96b..12db646 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -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);