From e4522507ad76a56e6838825e8f92779d234144f1 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 7 Feb 2022 11:05:14 +0200 Subject: [PATCH] libweston: Assert if ref-count balance is wrong Calling weston_surface_destroy() one time too many could be a sign we haven't correctly increased the ref count for it. Also, if we don't have a surface being passed, do no attempt to use it. Signed-off-by: Marius Vlad (cherry picked from commit d3ed2eb34533e901f4d02c45058318bc3f922cb2) --- libweston/compositor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libweston/compositor.c b/libweston/compositor.c index 3a838ec7..ff3fa45b 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -2306,6 +2306,10 @@ weston_surface_destroy(struct weston_surface *surface) struct weston_pointer_constraint *constraint, *next_constraint; struct weston_paint_node *pnode, *pntmp; + if (!surface) + return; + + assert(surface->ref_count > 0); if (--surface->ref_count > 0) return;