Mesa (9.1): nvc0/ir: fix use after free in texture barrier insertion pass
Carl Worth
cworth at kemper.freedesktop.org
Thu Oct 3 05:00:10 UTC 2013
Module: Mesa
Branch: 9.1
Commit: 2e8bcfa56dcdebfa31c729ebc23755c5480667f4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e8bcfa56dcdebfa31c729ebc23755c5480667f4
Author: Tiziano Bacocco <tizbac2 at gmail.com>
Date: Tue Jul 30 22:04:49 2013 +0200
nvc0/ir: fix use after free in texture barrier insertion pass
Fixes crash with Amnesia: The Dark Descent.
Cc: "9.2 and 9.1" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7086636358b611a2bb124253e1fe870107e1cecb)
---
.../drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
index c5a7772..cfd1f88 100644
--- a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
@@ -441,6 +441,7 @@ NVC0LegalizePostRA::insertTextureBarriers(Function *fn)
if (i->op == OP_TEXBAR) {
if (i->subOp >= max) {
delete_Instruction(prog, i);
+ i = NULL;
} else {
max = i->subOp;
if (prev && prev->op == OP_TEXBAR && prev->subOp >= max) {
@@ -452,7 +453,7 @@ NVC0LegalizePostRA::insertTextureBarriers(Function *fn)
if (isTextureOp(i->op)) {
max++;
}
- if (!i->isNop())
+ if (i && !i->isNop())
prev = i;
}
}
More information about the mesa-commit
mailing list