Mesa (master): swrast: Fix memory leaks in blit_linear.

Vinson Lee vlee at kemper.freedesktop.org
Tue Apr 3 04:48:04 UTC 2012


Module: Mesa
Branch: master
Commit: 431b458f24f05db612e276e12528ce0e62707b65
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=431b458f24f05db612e276e12528ce0e62707b65

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Sat Mar 31 23:11:42 2012 -0700

swrast: Fix memory leaks in blit_linear.

Fixes Coverity resource leak defects.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/swrast/s_blit.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index 6d0b889..b0c56a4 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -566,6 +566,9 @@ blit_linear(struct gl_context *ctx,
                                   GL_MAP_READ_BIT | GL_MAP_WRITE_BIT,
                                   &srcMap, &srcRowStride);
       if (!srcMap) {
+         free(srcBuffer0);
+         free(srcBuffer1);
+         free(dstBuffer);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFramebuffer");
          return;
       }
@@ -582,6 +585,9 @@ blit_linear(struct gl_context *ctx,
 				  0, 0, readRb->Width, readRb->Height,
                                   GL_MAP_READ_BIT, &srcMap, &srcRowStride);
       if (!srcMap) {
+         free(srcBuffer0);
+         free(srcBuffer1);
+         free(dstBuffer);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFramebuffer");
          return;
       }
@@ -590,6 +596,9 @@ blit_linear(struct gl_context *ctx,
                                   GL_MAP_WRITE_BIT, &dstMap, &dstRowStride);
       if (!dstMap) {
          ctx->Driver.UnmapRenderbuffer(ctx, readRb);
+         free(srcBuffer0);
+         free(srcBuffer1);
+         free(dstBuffer);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFramebuffer");
          return;
       }




More information about the mesa-commit mailing list