diff options
| author | Roel Kluin <[email protected]> | 2010-01-06 08:27:42 -0800 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-01-06 09:47:37 -0700 |
| commit | 324568f79d6e014900c981bd9a0e1dffedc326c8 (patch) | |
| tree | 04c0dc711d64d575fb9adc02107803bec5c2257f /src/mesa/shader | |
| parent | 5db710a8231fe50d2faad8e9adb2a07616cc6130 (diff) | |
mesa: test index bounds before array element
Check whether the index is within bounds before accessing the array.
Signed-off-by: Roel Kluin <[email protected]>
Signed-off-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/nvfragparse.c | 2 | ||||
| -rw-r--r-- | src/mesa/shader/prog_optimize.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c index b739a6aa07c..8ee7c930626 100644 --- a/src/mesa/shader/nvfragparse.c +++ b/src/mesa/shader/nvfragparse.c @@ -642,7 +642,7 @@ Parse_SwizzleSuffix(const GLubyte *token, GLuint swizzle[4]) else { /* 4-component swizzle (vector) */ GLint k; - for (k = 0; token[k] && k < 4; k++) { + for (k = 0; k < 4 && token[k]; k++) { if (token[k] == 'x') swizzle[k] = 0; else if (token[k] == 'y') diff --git a/src/mesa/shader/prog_optimize.c b/src/mesa/shader/prog_optimize.c index 4fe351251e8..8b9466a5a61 100644 --- a/src/mesa/shader/prog_optimize.c +++ b/src/mesa/shader/prog_optimize.c @@ -578,7 +578,7 @@ _mesa_remove_extra_moves(struct gl_program *prog) /* get pointer to previous instruction */ prevI = i - 1; - while (removeInst[prevI] && prevI > 0) + while (prevI > 0 && removeInst[prevI]) prevI--; prevInst = prog->Instructions + prevI; |