ir_to_mesa: Don't dereference a NULL pointer during copy propagation
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 11 Feb 2011 23:19:05 +0000 (15:19 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 11 Feb 2011 23:44:19 +0000 (15:44 -0800)
The ACP may already be NULL, so don't try to make it NULL again.

This should fix bugzilla #34119.

src/mesa/program/ir_to_mesa.cpp

index d0ec23fc857c8439f5b43af8134b64e14ffab4f4..7f905ae5ce342200582a4560c05ff5925d1516cc 100644 (file)
@@ -2754,6 +2754,9 @@ ir_to_mesa_visitor::copy_propagate(void)
             */
            for (int r = 0; r < this->next_temp; r++) {
               for (int c = 0; c < 4; c++) {
+                 if (!acp[4 * r + c])
+                    continue;
+
                  if (acp[4 * r + c]->src_reg[0].file == PROGRAM_OUTPUT)
                     acp[4 * r + c] = NULL;
               }