summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-06-28 16:47:39 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-28 16:47:39 -0600
commit9d94d133b019ef23ee03cc691fcb5602451604ae (patch)
tree0bf9a15003ec0c78b9f6e4e6f7df724a0a9a15bf
parent2242769a13de228df10fb55d50aa4d96c99d5975 (diff)
mesa: added null ptr checks
-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 d96a916533..f57df3d86d 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 > (GLuint)max)
max = len;