more bug fixing, error checking

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index b916e75b932..aab522e292c 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -912,6 +912,11 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
       }
    }
 
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glUniform(count < 0)");
+      return;
+   }
+
    switch (type) {
    case GL_FLOAT:
    case GL_INT:
@@ -945,13 +950,13 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
           type == GL_INT_VEC2 ||
           type == GL_INT_VEC3 ||
           type == GL_INT_VEC4) {
-         const GLint *iValues = (const GLint *) values;
+         const GLint *iValues = ((const GLint *) values) + k * elems;
          for (i = 0; i < elems; i++) {
             uniformVal[i] = (GLfloat) iValues[i];
          }
       }
       else {
-         const GLfloat *fValues = (const GLfloat *) values;
+         const GLfloat *fValues = ((const GLfloat *) values) + k * elems;
          for (i = 0; i < elems; i++) {
             uniformVal[i] = fValues[i];
          }