From c0a61c8442af3cfa810098d34bf6a21d11a5d720 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 28 Oct 2009 13:09:44 -0600 Subject: intel: Fix memory leak in case of renderbuffer bad format Signed-off-by: Brian Paul --- src/mesa/drivers/dri/intel/intel_fbo.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index cf007d5b62..a49868bfef 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -385,6 +385,7 @@ intel_create_renderbuffer(GLenum intFormat) default: _mesa_problem(NULL, "Unexpected intFormat in intel_create_renderbuffer"); + _mesa_free(irb); return NULL; } -- cgit v1.2.3 From 96128fdf2f959e2b59eca8f234dc6f3adf7a553f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 28 Oct 2009 17:59:49 -0600 Subject: mesa: Fix memory leak if we run out of memory Signed-off-by: Brian Paul --- src/mesa/main/texstore.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index a22db628d3..d3237959e0 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -589,8 +589,12 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims, /* unpack and transfer the source image */ tempImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth * components * sizeof(GLchan)); - if (!tempImage) + if (!tempImage) { + if (freeSrcImage) { + _mesa_free((void *) srcAddr); + } return NULL; + } dst = tempImage; for (img = 0; img < srcDepth; img++) { -- cgit v1.2.3