Mesa (master): i915, i965: Fix memory leak in intel_miptree_create_for_bo.

Chad Versace chadversary at kemper.freedesktop.org
Mon Nov 11 21:23:33 UTC 2013


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

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Fri Sep 27 22:20:04 2013 -0700

i915, i965: Fix memory leak in intel_miptree_create_for_bo.

Fixes "Resource leak" defects reported by Coverity.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/mesa/drivers/dri/i915/intel_mipmap_tree.c |    4 +++-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
index 66a7a92..f0ad30c 100644
--- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
@@ -264,8 +264,10 @@ intel_miptree_create_for_bo(struct intel_context *intel,
                                     0, 0,
                                     width, height, 1,
                                     true);
-   if (!mt)
+   if (!mt) {
+      free(region);
       return mt;
+   }
 
    region->cpp = mt->cpp;
    region->width = width;
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index bb986bd..884ddef 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -636,8 +636,10 @@ intel_miptree_create_for_bo(struct brw_context *brw,
                                     0, 0,
                                     width, height, 1,
                                     true, 0 /* num_samples */);
-   if (!mt)
+   if (!mt) {
+      free(region);
       return mt;
+   }
 
    region->cpp = mt->cpp;
    region->width = width;




More information about the mesa-commit mailing list