From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 15 Oct 2010 12:23:30 +0000 (+0100)
Subject: llvmpipe: validate color outputs against key->nr_cbufs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ac98519c4eed0daf770a9ba380056978e4420352;p=mesa.git

llvmpipe: validate color outputs against key->nr_cbufs
---

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index c4b1b868b65..c070b55d3d1 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -404,7 +404,8 @@ generate_fs(struct llvmpipe_context *lp,
    /* Color write  */
    for (attrib = 0; attrib < shader->info.base.num_outputs; ++attrib)
    {
-      if (shader->info.base.output_semantic_name[attrib] == TGSI_SEMANTIC_COLOR)
+      if (shader->info.base.output_semantic_name[attrib] == TGSI_SEMANTIC_COLOR &&
+          shader->info.base.output_semantic_index[attrib] < key->nr_cbufs)
       {
          unsigned cbuf = shader->info.base.output_semantic_index[attrib];
          for(chan = 0; chan < NUM_CHANNELS; ++chan) {