From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 16 May 2008 16:49:44 +0000 (-0600)
Subject: silence warning, new assertion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2632212ad7735c659331b65d3bfe14aef0faccb;p=mesa.git

silence warning, new assertion
---

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 08fa9a7e233..61d51c3871d 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -942,7 +942,7 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
    if (shProg) {
       if (location < shProg->Uniforms->NumUniforms) {
          GLint progPos, i;
-         const struct gl_program *prog;
+         const struct gl_program *prog = NULL;
 
          progPos = shProg->Uniforms->Uniforms[location].VertPos;
          if (progPos >= 0) {
@@ -955,8 +955,11 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
             }
          }
 
-         for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
-            params[i] = prog->Parameters->ParameterValues[progPos][i];
+         ASSERT(prog);
+         if (prog) {
+            for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
+               params[i] = prog->Parameters->ParameterValues[progPos][i];
+            }
          }
       }
       else {