Mesa (master): pan/midgard: Fix bundle dynarray leak

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jan 23 19:57:14 UTC 2020


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

Author: Icecream95 <ixn at keemail.me>
Date:   Wed Jan 22 10:43:23 2020 +1300

pan/midgard: Fix bundle dynarray leak

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3496>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3496>

---

 src/panfrost/midgard/midgard_schedule.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c
index 59efeb5a4f7..bc71533ed9d 100644
--- a/src/panfrost/midgard/midgard_schedule.c
+++ b/src/panfrost/midgard/midgard_schedule.c
@@ -1092,10 +1092,11 @@ schedule_block(compiler_context *ctx, midgard_block *block)
 
         /* We emitted bundles backwards; copy into the block in reverse-order */
 
-        util_dynarray_init(&block->bundles, NULL);
+        util_dynarray_init(&block->bundles, block);
         util_dynarray_foreach_reverse(&bundles, midgard_bundle, bundle) {
                 util_dynarray_append(&block->bundles, midgard_bundle, *bundle);
         }
+        util_dynarray_fini(&bundles);
 
         /* Blend constant was backwards as well. blend_offset if set is
          * strictly positive, as an offset of zero would imply constants before



More information about the mesa-commit mailing list