Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / mesa / shader / prog_uniform.c

diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index 20e004b350c8a97fb25e719756f340e30be30752..25d7c0997bcf8fda8b8a3972b1e952510a92ab68 100644 (file)
--- a/src/mesa/shader/prog_uniform.c
+++ b/src/mesa/shader/prog_uniform.c
@@ -119,7 +119,7 @@ GLint
 _mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name)
 {
    GLuint i;
-   for (i = 0; i < list->NumUniforms; i++) {
+   for (i = 0; list && i < list->NumUniforms; i++) {
       if (!_mesa_strcmp(list->Uniforms[i].Name, name)) {
          return i;
       }
@@ -133,8 +133,8 @@ _mesa_longest_uniform_name(const struct gl_uniform_list *list)
 {
    GLint max = 0;
    GLuint i;
-   for (i = 0; i < list->NumUniforms; i++) {
-      GLuint len = _mesa_strlen(list->Uniforms[i].Name);
+   for (i = 0; list && i < list->NumUniforms; i++) {
+      GLint len = (GLint)_mesa_strlen(list->Uniforms[i].Name);
       if (len > max)
          max = len;
    }