diff options
author | José Fonseca <[email protected]> | 2012-03-02 12:44:00 +0000 |
---|---|---|
committer | José Fonseca <[email protected]> | 2012-03-09 18:57:17 +0000 |
commit | 105ef87842d4ba82dc0235ec154e662cce56a927 (patch) | |
tree | 9f46168ce894f3a6484a7c5f72a98b620738aede /src | |
parent | f5d0ced242abc9e4e777bbe374585f44399b75af (diff) |
svga: Disable bogus assertions concerning min_index/max_index.
min_index/max_index are merely conservative guesses, so we can't
make buffer overflow detection based on their values.
Tested-by: Jakob Bornecrantz <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/svga/svga_draw.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c index c43d1a3443f..41e0e1adc2f 100644 --- a/src/gallium/drivers/svga/svga_draw.c +++ b/src/gallium/drivers/svga/svga_draw.c @@ -310,12 +310,6 @@ enum pipe_error svga_hwtnl_prim( struct svga_hwtnl *hwtnl, assert(size); assert(offset < size); assert(min_index <= max_index); - if (index_bias >= 0) { - assert(offset + index_bias*stride < size); - } - if (min_index != ~0 && index_bias >= 0) { - assert(offset + (index_bias + min_index) * stride < size); - } switch (hwtnl->cmd.vdecl[i].identity.type) { case SVGA3D_DECLTYPE_FLOAT1: @@ -375,9 +369,14 @@ enum pipe_error svga_hwtnl_prim( struct svga_hwtnl *hwtnl, break; } - if (max_index != ~0) { - assert(offset + (index_bias + max_index) * stride + width <= size); + if (index_bias >= 0) { + assert(offset + index_bias*stride + width <= size); } + + /* + * min_index/max_index are merely conservative guesses, so we can't + * make buffer overflow detection based on their values. + */ } assert(range->indexWidth == range->indexArray.stride); |