From: tokyo4j <hrak1529@gmail.com>
Date: Sat, 9 Aug 2025 10:53:10 +0000 (+0900)
Subject: osd: add null-check for output->osd_scene.tree
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=073fd02300195b889c1d7b0513cedc5f5dc779a0;p=proto%2Flabwc.git

osd: add null-check for output->osd_scene.tree

`wlr_scene_node_destroy(&output->osd_scene.tree->node);` does nothing
for null pointer, but ASAN is unhappy about accessing (NULL)->node.
---

diff --git a/src/osd.c b/src/osd.c
index 6ae3381d..39846795 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -33,9 +33,10 @@ destroy_osd_scenes(struct server *server)
 {
 	struct output *output;
 	wl_list_for_each(output, &server->outputs, link) {
-		wlr_scene_node_destroy(&output->osd_scene.tree->node);
-		output->osd_scene.tree = NULL;
-
+		if (output->osd_scene.tree) {
+			wlr_scene_node_destroy(&output->osd_scene.tree->node);
+			output->osd_scene.tree = NULL;
+		}
 		wl_array_release(&output->osd_scene.items);
 		wl_array_init(&output->osd_scene.items);
 	}