From b429e9b2d74ece0906602d2f843c0f8bf74c44f4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 28 Jun 2008 16:48:23 -0600
Subject: [PATCH] mesa: added null ptr checks

---
 src/mesa/shader/prog_uniform.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index 20e004b..0b1d023 100644
--- 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,7 +133,7 @@ _mesa_longest_uniform_name(const struct gl_uniform_list *list)
 {
    GLint max = 0;
    GLuint i;
-   for (i = 0; i < list->NumUniforms; i++) {
+   for (i = 0; list && i < list->NumUniforms; i++) {
       GLuint len = _mesa_strlen(list->Uniforms[i].Name);
       if (len > max)
          max = len;
-- 
2.7.4