Mesa (master): nv50: fix nv50_sampler_state_delete array overflow

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Mon Jun 6 09:21:32 UTC 2011


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

Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date:   Sun Jun  5 21:00:28 2011 +0200

nv50: fix nv50_sampler_state_delete array overflow

num_samplers is array of 3 elements, not 5

---

 src/gallium/drivers/nv50/nv50_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 8d75dd0..fb125f3 100644
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -508,7 +508,7 @@ nv50_sampler_state_delete(struct pipe_context *pipe, void *hwcso)
 {
    unsigned s, i;
 
-   for (s = 0; s < 5; ++s)
+   for (s = 0; s < 3; ++s)
       for (i = 0; i < nv50_context(pipe)->num_samplers[s]; ++i)
          if (nv50_context(pipe)->samplers[s][i] == hwcso)
             nv50_context(pipe)->samplers[s][i] = NULL;




More information about the mesa-commit mailing list