Mesa (master): llvmpipe: Fix bad refactoring.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sun Oct 17 16:58:57 UTC 2010


Module: Mesa
Branch: master
Commit: a0add0446ca9dce6d4a96014c42ba6cf3a73a44a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0add0446ca9dce6d4a96014c42ba6cf3a73a44a

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sun Oct 17 09:58:04 2010 -0700

llvmpipe: Fix bad refactoring.

'i' and 'chan' have random values here, which could cause a buffer
overflow in debug builds, if chan > 4.

---

 src/gallium/drivers/llvmpipe/lp_state_fs.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index c070b55..7acbe7e 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -365,8 +365,7 @@ generate_fs(struct llvmpipe_context *lp,
                                          0);
          
       if (pos0 != -1 && outputs[pos0][2]) {
-         z = LLVMBuildLoad(builder, outputs[pos0][2], "z");
-         lp_build_name(z, "output%u.%u.%c", i, pos0, "xyzw"[chan]);
+         z = LLVMBuildLoad(builder, outputs[pos0][2], "output.z");
       }
 
       lp_build_depth_stencil_test(builder,




More information about the mesa-commit mailing list