From f8937ef1557797ceb52519b68434f608a7b68690 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 4 May 2011 14:09:15 +0200 Subject: [PATCH] Fix possible NULL pointer dereference in headset_server_init --- audio/manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/audio/manager.c b/audio/manager.c index 7e206bec2..f9b460eff 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -697,8 +697,11 @@ static int headset_server_init(struct audio_adapter *adapter) return 0; failed: - error("%s", err->message); - g_error_free(err); + if (err) { + error("%s", err->message); + g_error_free(err); + } + if (adapter->hsp_ag_server) { g_io_channel_shutdown(adapter->hsp_ag_server, TRUE, NULL); g_io_channel_unref(adapter->hsp_ag_server); -- 2.47.3