summaryrefslogtreecommitdiff
path: root/src/mesa/shader/prog_uniform.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-28 16:48:23 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-28 16:48:58 -0600
commitb429e9b2d74ece0906602d2f843c0f8bf74c44f4 (patch)
treec7ed3fb770fb8322be99cfd631ed76ed8b0f7887 /src/mesa/shader/prog_uniform.c
parentf6da1453c5b4add37518b2e1f27abb02854864f2 (diff)
mesa: added null ptr checks
Diffstat (limited to 'src/mesa/shader/prog_uniform.c')
-rw-r--r--src/mesa/shader/prog_uniform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index 20e004b350..0b1d0232a0 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;