* [PATCH] android/avrcp: Close AVRCP channel on error
@ 2014-01-30 13:23 Andrei Emeltchenko
2014-02-02 16:05 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 2+ messages in thread
From: Andrei Emeltchenko @ 2014-01-30 13:23 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This fixes resource leak.
---
android/avrcp.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/android/avrcp.c b/android/avrcp.c
index 485b485..ef833df 100644
--- a/android/avrcp.c
+++ b/android/avrcp.c
@@ -248,13 +248,13 @@ bool bt_avrcp_register(const bdaddr_t *addr)
rec = avrcp_record();
if (!rec) {
error("Failed to allocate AVRCP record");
- return false;
+ goto fail;
}
if (bt_adapter_add_record(rec, 0) < 0) {
error("Failed to register AVRCP record");
sdp_record_free(rec);
- return false;
+ goto fail;
}
record_id = rec->handle;
@@ -262,6 +262,12 @@ bool bt_avrcp_register(const bdaddr_t *addr)
G_N_ELEMENTS(cmd_handlers));
return true;
+fail:
+ g_io_channel_shutdown(server, TRUE, NULL);
+ g_io_channel_unref(server);
+ server = NULL;
+
+ return false;
}
void bt_avrcp_unregister(void)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] android/avrcp: Close AVRCP channel on error
2014-01-30 13:23 [PATCH] android/avrcp: Close AVRCP channel on error Andrei Emeltchenko
@ 2014-02-02 16:05 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2014-02-02 16:05 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Thu, Jan 30, 2014 at 5:23 AM, Andrei Emeltchenko
<Andrei.Emeltchenko.news@gmail.com> wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> This fixes resource leak.
> ---
> android/avrcp.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/android/avrcp.c b/android/avrcp.c
> index 485b485..ef833df 100644
> --- a/android/avrcp.c
> +++ b/android/avrcp.c
> @@ -248,13 +248,13 @@ bool bt_avrcp_register(const bdaddr_t *addr)
> rec = avrcp_record();
> if (!rec) {
> error("Failed to allocate AVRCP record");
> - return false;
> + goto fail;
> }
>
> if (bt_adapter_add_record(rec, 0) < 0) {
> error("Failed to register AVRCP record");
> sdp_record_free(rec);
> - return false;
> + goto fail;
> }
> record_id = rec->handle;
>
> @@ -262,6 +262,12 @@ bool bt_avrcp_register(const bdaddr_t *addr)
> G_N_ELEMENTS(cmd_handlers));
>
> return true;
> +fail:
> + g_io_channel_shutdown(server, TRUE, NULL);
> + g_io_channel_unref(server);
> + server = NULL;
> +
> + return false;
> }
>
> void bt_avrcp_unregister(void)
> --
> 1.8.3.2
Applied, thanks.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-02 16:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-30 13:23 [PATCH] android/avrcp: Close AVRCP channel on error Andrei Emeltchenko
2014-02-02 16:05 ` Luiz Augusto von Dentz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.