From 05cb6b8d3fbd30fa81f7f3500297a84165594642 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 6 Mar 2014 14:58:02 +0200 Subject: [PATCH] android/avrcp: Fix warnings when freeing avrcp_device struct If the device does not yet have queue due to not have a session it cause the following warnings when avrcp_device_free is called: (bluetoothd:1102): GLib-CRITICAL **: g_queue_foreach: assertion 'queue != NULL' failed (bluetoothd:1102): GLib-CRITICAL **: g_queue_free: assertion 'queue != NULL' failed --- android/avrcp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/android/avrcp.c b/android/avrcp.c index 911b1dfba..1d211adeb 100644 --- a/android/avrcp.c +++ b/android/avrcp.c @@ -442,8 +442,10 @@ static void avrcp_device_free(void *data) { struct avrcp_device *dev = data; - g_queue_foreach(dev->queue, (GFunc) g_free, NULL); - g_queue_free(dev->queue); + if (dev->queue) { + g_queue_foreach(dev->queue, (GFunc) g_free, NULL); + g_queue_free(dev->queue); + } if (dev->session) avrcp_shutdown(dev->session); -- 2.47.3