From 1ee75786b40e3cf51428fe1a4fb67e09be163537 Mon Sep 17 00:00:00 2001 From: Alexander Orzechowski Date: Thu, 4 May 2023 14:16:34 -0400 Subject: drm_format_set_union: Require initialized dst and remove assert --- render/drm_format_set.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'render') diff --git a/render/drm_format_set.c b/render/drm_format_set.c index c8611755..464c0fb4 100644 --- a/render/drm_format_set.c +++ b/render/drm_format_set.c @@ -258,8 +258,6 @@ static bool drm_format_set_extend(struct wlr_drm_format_set *dst, bool wlr_drm_format_set_union(struct wlr_drm_format_set *dst, const struct wlr_drm_format_set *a, const struct wlr_drm_format_set *b) { - assert(dst != a && dst != b); - struct wlr_drm_format_set out = {0}; out.capacity = a->len + b->len; out.formats = calloc(out.capacity, sizeof(struct wlr_drm_format *)); @@ -276,6 +274,7 @@ bool wlr_drm_format_set_union(struct wlr_drm_format_set *dst, return false; } + wlr_drm_format_set_finish(dst); *dst = out; return true; -- cgit v1.2.3