Mesa (9.2): i915,i965: Fix memory leak in try_pbo_upload (v2)

[Ian Romanick]

Module: Mesa
Branch: 9.2
Commit: 996bc26c873b6c992af46c9eca10bfa0f3a3b05e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=996bc26c873b6c992af46c9eca10bfa0f3a3b05e

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Thu Aug  1 23:04:27 2013 -0700

i915,i965: Fix memory leak in try_pbo_upload (v2)

Fixes "Resource leak" defect reported by Coverity.
Tested on Haswell, no Piglit regressions.

v2: Apply to i965, not just i915. (chadv)

CC: "9.2, 9.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
(cherry picked from commit 035bf2198368d3fa69387788a63039d71319f0bf)

---

 src/mesa/drivers/dri/i915/intel_tex_image.c |    1 +
 src/mesa/drivers/dri/i965/intel_tex_image.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/intel_tex_image.c b/src/mesa/drivers/dri/i915/intel_tex_image.c
index 9b1336d..975e77a 100644
--- a/src/mesa/drivers/dri/i915/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i915/intel_tex_image.c
@@ -171,6 +171,7 @@ try_pbo_upload(struct gl_context *ctx,
                            0, 0, false,
                            image->Width, image->Height, GL_COPY)) {
       DBG("%s: blit failed\n", __FUNCTION__);
+      intel_miptree_release(&pbo_mt);
       return false;
    }
 
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index 4b551b7..4506c3c 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -173,6 +173,7 @@ try_pbo_upload(struct gl_context *ctx,
                            0, 0, false,
                            image->Width, image->Height, GL_COPY)) {
       DBG("%s: blit failed\n", __FUNCTION__);
+      intel_miptree_release(&pbo_mt);
       return false;
    }