Merge remote branch 'origin/master' into arb_geometry_shader4

Conflicts:
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/r300/r300_state_derived.c
	src/gallium/drivers/softpipe/sp_state_derived.c
	src/gallium/include/pipe/p_defines.h

1 files changed, 2 insertions, 0 deletions

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 4db950016b8..af50d64f510 100644
--- a/progs/util/shaderutil.c
+++ b/progs/util/shaderutil.c
@@ -84,6 +84,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
    f = fopen(filename, "r");
    if (!f) {
       fprintf(stderr, "Unable to open shader file %s\n", filename);
+      free(buffer);
       return 0;
    }
 
@@ -94,6 +95,7 @@ CompileShaderFile(GLenum shaderType, const char *filename)
       shader = CompileShaderText(shaderType, buffer);
    }
    else {
+      free(buffer);
       return 0;
    }