Mesa (master): mesa: don't smash the stack in _mesa_find_used_registers
Luca Barbieri
lb at kemper.freedesktop.org
Sun Sep 5 15:58:17 UTC 2010
Module: Mesa
Branch: master
Commit: 029c1815717ea62bae28e86798c86dfa98cbc8a7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=029c1815717ea62bae28e86798c86dfa98cbc8a7
Author: Luca Barbieri <luca at luca-barbieri.com>
Date: Sun Sep 5 17:57:12 2010 +0200
mesa: don't smash the stack in _mesa_find_used_registers
At some point this actually triggered, not sure if it still does.
Give a meaningful assert and refuse to smash the stack anyway.
---
src/mesa/program/program.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index 3b6d682..06b9539 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -876,12 +876,16 @@ _mesa_find_used_registers(const struct gl_program *prog,
const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
if (inst->DstReg.File == file) {
- used[inst->DstReg.Index] = GL_TRUE;
+ ASSERT(inst->DstReg.Index < usedSize);
+ if(inst->DstReg.Index < usedSize)
+ used[inst->DstReg.Index] = GL_TRUE;
}
for (j = 0; j < n; j++) {
if (inst->SrcReg[j].File == file) {
- used[inst->SrcReg[j].Index] = GL_TRUE;
+ ASSERT(inst->SrcReg[j].Index < usedSize);
+ if(inst->SrcReg[j].Index < usedSize)
+ used[inst->SrcReg[j].Index] = GL_TRUE;
}
}
}
More information about the mesa-commit
mailing list