dbus: manager: move g_tree_remove() out of g_assert() in gpiodbus_id_free()

brgl · brgl · commit 84700a6d5fe7 · 2026-06-08T10:01:21.000+02:00
g_assert() is compiled out when G_DISABLE_ASSERT is defined, which would cause the g_tree_remove() call to disappear entirely, leading to ID leaks and eventual resource exhaustion. Move the side-effecting call outside the assertion, consistent with the pattern used elsewhere in the daemon. Fixes: a5ab76d ("dbus: add the D-Bus daemon, command-line client and tests") Assisted-by: Claude Opus 4.6 Reviewed-by: Vincent Fazio <vfazio@xes-inc.com> Tested-by: Vincent Fazio <vfazio@xes-inc.com> Link: https://patch.msgid.link/20260604-pre-2-3-fixes-v2-15-781bcaf47475@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
diff --git a/dbus/manager/helpers.c b/dbus/manager/helpers.c
@@ -43,7 +43,10 @@ gint gpiodbus_id_alloc(GTree *id_root)
 
 void gpiodbus_id_free(GTree *id_root, gint id)
 {
-	g_assert(g_tree_remove(id_root, &id));
+	gboolean removed;
+
+	removed = g_tree_remove(id_root, &id);
+	g_assert(removed);
 }
 
 gboolean

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,10 @@ gint gpiodbus_id_alloc(GTree *id_root)`
`43`	`43`
`44`	`44`	`void gpiodbus_id_free(GTree *id_root, gint id)`
`45`	`45`	`{`
`46`		`- g_assert(g_tree_remove(id_root, &id));`
	`46`	`+ gboolean removed;`
	`47`	`+`
	`48`	`+ removed = g_tree_remove(id_root, &id);`
	`49`	`+ g_assert(removed);`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`gboolean`