Mesa (staging/19.2): nir: fix memleak in error path

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: ffa1f33ec0fc2153aca1bb1d0e85d5d11e6c892b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ffa1f33ec0fc2153aca1bb1d0e85d5d11e6c892b

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Mon Aug 26 15:33:31 2019 +0100

nir: fix memleak in error path

Fixes: 2cf59861a8128a91bfdd ("nir: Add partial redundancy elimination for compares")
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 7659c6197f08587f57f101a88a7e477337ce363c)

---

 src/compiler/nir/nir_opt_comparison_pre.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_opt_comparison_pre.c b/src/compiler/nir/nir_opt_comparison_pre.c
index 33295e5eea6..a74dfa8939a 100644
--- a/src/compiler/nir/nir_opt_comparison_pre.c
+++ b/src/compiler/nir/nir_opt_comparison_pre.c
@@ -107,8 +107,10 @@ push_block(struct block_queue *bq)
 
    if (!u_vector_init(&bi->instructions,
                       sizeof(nir_alu_instr *),
-                      8 * sizeof(nir_alu_instr *)))
+                      8 * sizeof(nir_alu_instr *))) {
+      free(bi);
       return NULL;
+   }
 
    exec_list_push_tail(&bq->blocks, &bi->node);