Mesa (staging/19.0): vc4: Fix leak in HW queries error path

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: 4d1dd3b0cdad7f3b5308440bed2c3cbfbee2756c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d1dd3b0cdad7f3b5308440bed2c3cbfbee2756c

Author: Ernestas Kulik <ernestas.kulik at gmail.com>
Date:   Thu Aug 30 19:02:47 2018 +0300

vc4: Fix leak in HW queries error path

Reported by Coverity: in the case where there exist hardware and
non-hardware queries, the code does not jump to err_free_query and leaks
the query.

CID: 1430194
Signed-off-by: Ernestas Kulik <ernestas.kulik at gmail.com>
Fixes: 9ea90ffb98fb ("broadcom/vc4: Add support for HW perfmon")
(cherry picked from commit f6e49d5ad0fde19a074644491475470d684dd721)

---

 src/gallium/drivers/vc4/vc4_query.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/vc4/vc4_query.c b/src/gallium/drivers/vc4/vc4_query.c
index 6e4681e93c..f08785f457 100644
--- a/src/gallium/drivers/vc4/vc4_query.c
+++ b/src/gallium/drivers/vc4/vc4_query.c
@@ -132,7 +132,7 @@ vc4_create_batch_query(struct pipe_context *pctx, unsigned num_queries,
 
         /* We can't mix HW and non-HW queries. */
         if (nhwqueries && nhwqueries != num_queries)
-                return NULL;
+                goto err_free_query;
 
         if (!nhwqueries)
                 return (struct pipe_query *)query;