From 1d6d472342aee7b9c68e9f1d92762ef808d35ac2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 26 Mar 2012 14:34:38 +0200
Subject: fontconfig libxcb mesa xkeyboard-config git update 26 Mar 2012

---
 mesalib/src/mesa/main/texobj.c          | 3 ++-
 mesalib/src/mesa/main/uniform_query.cpp | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'mesalib/src/mesa/main')

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index cfaac64bf..97bef3543 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -567,7 +567,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
       GLint i;
       const GLint minLevel = baseLevel;
       const GLint maxLevel = t->_MaxLevel;
-      GLuint width, height, depth, face, numFaces = 1;
+      const GLuint numFaces = t->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+      GLuint width, height, depth, face;
 
       if (minLevel > maxLevel) {
          incomplete(t, BASE, "minLevel > maxLevel");
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index 991df7896..da41ee84c 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -905,8 +905,10 @@ _mesa_get_uniform_location(struct gl_context *ctx,
       name_copy[i-1] = '\0';
 
       offset = strtol(&name[i], NULL, 10);
-      if (offset < 0)
+      if (offset < 0) {
+	 free(name_copy);
 	 return -1;
+      }
 
       array_lookup = true;
    } else {
-- 
cgit v1.2.3