Mesa (master): intel: Fix memory leak in intel_miptree_create()
Chad Versace
chadversary at kemper.freedesktop.org
Thu Dec 29 18:48:07 UTC 2011
Module: Mesa
Branch: master
Commit: 747f0307626ef5bcf2f889ab66bcc95ab8eda2c8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=747f0307626ef5bcf2f889ab66bcc95ab8eda2c8
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Tue Dec 27 10:10:05 2011 -0800
intel: Fix memory leak in intel_miptree_create()
On failure, intel_miptree_create() needs to *release* the miptree, not
just free it, so that the stencil_mt gets released too.
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 9576489..60cc694 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -204,7 +204,7 @@ intel_miptree_create(struct intel_context *intel,
* pitch == 0 || height == 0 indicates the null texture
*/
if (!mt || !mt->total_width || !mt->total_height) {
- free(mt);
+ intel_miptree_release(&mt);
return NULL;
}
@@ -216,7 +216,7 @@ intel_miptree_create(struct intel_context *intel,
expect_accelerated_upload);
if (!mt->region) {
- free(mt);
+ intel_miptree_release(&mt);
return NULL;
}
More information about the mesa-commit
mailing list