KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/glsl_to_tgsi: prevent infinite loop 

`unsigned j` would never fail `j >= 0`, leading to an infinite loop as
`j--` wraps around.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Eric Engestrom 2016-05-31 02:20:12 +01:00 committed by Marek Olšák
parent f87352d769
commit 35fd5282ea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@ -2447,7 +2447,8 @@ shrink_array_declarations(struct array_decl *arrays, unsigned count,
GLbitfield64 double_usage_mask,
GLbitfield patch_usage_mask)
{
unsigned i, j;
unsigned i;
int j;
/* Fix array declarations by removing unused array elements at both ends
* of the arrays. For example, mat4[3] where only mat[1] is used.
@ -2456,7 +2457,7 @@ shrink_array_declarations(struct array_decl *arrays, unsigned count,
struct array_decl *decl = &arrays[i];
/* Shrink the beginning. */
for (j = 0; j < decl->array_size; j++) {
for (j = 0; j < (int)decl->array_size; j++) {
if (decl->mesa_index >= VARYING_SLOT_PATCH0) {
if (patch_usage_mask &
BITFIELD64_BIT(decl->mesa_index - VARYING_SLOT_PATCH0 + j))