Mesa (master): st/mesa: use pipe_sampler_view_release()

Brian Paul brianp at kemper.freedesktop.org
Sun Dec 22 14:09:22 UTC 2013


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

Author: Jonathan Liu <net147 at gmail.com>
Date:   Sat Dec 14 07:15:00 2013 -0700

st/mesa: use pipe_sampler_view_release()

This fixes a crash where old_view->context was already freed in the
pipe_sampler_view_reference function contained in
src/gallium/auxiliary/utils/u_inlines.h. As a result, the
sampler_view_destroy function pointer contained 0xfeeefeee indicating
freed heap memory.

Cc: "10.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Jonathan Liu <net147 at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/state_tracker/st_atom_texture.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c
index d79e04c..bd0a22d 100644
--- a/src/mesa/state_tracker/st_atom_texture.c
+++ b/src/mesa/state_tracker/st_atom_texture.c
@@ -255,7 +255,7 @@ update_single_texture(struct st_context *st,
 				stObj->base.DepthMode) ||
 	  (view_format != stObj->sampler_view->format) ||
 	  stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) {
-	 pipe_sampler_view_reference(&stObj->sampler_view, NULL);
+	 pipe_sampler_view_release(pipe, &stObj->sampler_view);
       }
    }
 




More information about the mesa-commit mailing list