nv50: assert before trying to out-of-bounds access textures
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
@@ -87,6 +87,7 @@ nv50_context_unreference_resources(struct nv50_context *nv50)
|
||||
pipe_resource_reference(&nv50->idxbuf.buffer, NULL);
|
||||
|
||||
for (s = 0; s < 3; ++s) {
|
||||
assert(nv50->num_textures[s] <= PIPE_MAX_SAMPLERS);
|
||||
for (i = 0; i < nv50->num_textures[s]; ++i)
|
||||
pipe_sampler_view_reference(&nv50->textures[s][i], NULL);
|
||||
|
||||
@@ -168,6 +169,7 @@ nv50_invalidate_resource_storage(struct nouveau_context *ctx,
|
||||
|
||||
if (res->bind & PIPE_BIND_SAMPLER_VIEW) {
|
||||
for (s = 0; s < 3; ++s) {
|
||||
assert(nv50->num_textures[s] <= PIPE_MAX_SAMPLERS);
|
||||
for (i = 0; i < nv50->num_textures[s]; ++i) {
|
||||
if (nv50->textures[s][i] &&
|
||||
nv50->textures[s][i]->texture == res) {
|
||||
|
||||
@@ -646,6 +646,7 @@ nv50_stage_set_sampler_views(struct nv50_context *nv50, int s,
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
assert(nr <= PIPE_MAX_SAMPLERS);
|
||||
for (i = 0; i < nr; ++i) {
|
||||
struct nv50_tic_entry *old = nv50_tic_entry(nv50->textures[s][i]);
|
||||
if (old)
|
||||
@@ -654,6 +655,7 @@ nv50_stage_set_sampler_views(struct nv50_context *nv50, int s,
|
||||
pipe_sampler_view_reference(&nv50->textures[s][i], views[i]);
|
||||
}
|
||||
|
||||
assert(nv50->num_textures[s] <= PIPE_MAX_SAMPLERS);
|
||||
for (i = nr; i < nv50->num_textures[s]; ++i) {
|
||||
struct nv50_tic_entry *old = nv50_tic_entry(nv50->textures[s][i]);
|
||||
if (!old)
|
||||
|
||||
@@ -222,6 +222,7 @@ nv50_validate_tic(struct nv50_context *nv50, int s)
|
||||
unsigned i;
|
||||
boolean need_flush = FALSE;
|
||||
|
||||
assert(nv50->num_textures[s] <= PIPE_MAX_SAMPLERS);
|
||||
for (i = 0; i < nv50->num_textures[s]; ++i) {
|
||||
struct nv50_tic_entry *tic = nv50_tic_entry(nv50->textures[s][i]);
|
||||
struct nv04_resource *res;
|
||||
|
||||
Reference in New Issue
Block a user