[PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[Santiago Carot-Nemesio]

Channel is not being released when the channel is attached over
an uninitialized GATT server.
---
 src/attrib-server.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 2995167..a23d5d2 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -1020,8 +1020,14 @@ guint attrib_channel_attach(GAttrib *attrib, gboolean out)
 	}
 
 	server = find_gatt_server(&channel->src);
-	if (server == NULL)
+	if (server == NULL) {
+		char src[18];
+
+		ba2str(&channel->src, src);
+		error("Not GATT server found in %s", src);
+		g_free(channel);
 		return 0;
+	}
 
 	channel->server = server;
 
-- 
1.7.9

Re: [PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[Anderson Lizardo]

Hi Santiago,

On Tue, Feb 7, 2012 at 5:33 AM, Santiago Carot-Nemesio
<sancane@gmail.com> wrote:
> Channel is not being released when the channel is attached over
> an uninitialized GATT server.
> ---
>  src/attrib-server.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/src/attrib-server.c b/src/attrib-server.c
> index 2995167..a23d5d2 100644
> --- a/src/attrib-server.c
> +++ b/src/attrib-server.c
> @@ -1020,8 +1020,14 @@ guint attrib_channel_attach(GAttrib *attrib, gboolean out)
>        }
>
>        server = find_gatt_server(&channel->src);
> -       if (server == NULL)
> +       if (server == NULL) {
> +               char src[18];
> +
> +               ba2str(&channel->src, src);
> +               error("Not GATT server found in %s", src);

Looks ok, except for the typo: Not -> No

> +               g_free(channel);
>                return 0;
> +       }
>
>        channel->server = server;
>
> --
> 1.7.9

Best Regards,
-- 
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil

[PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[Santiago Carot-Nemesio]

Channel is not being released when the channel is attached over
an uninitialized GATT server.
---
 src/attrib-server.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/attrib-server.c b/src/attrib-server.c
index 2995167..e51f695 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -1020,8 +1020,14 @@ guint attrib_channel_attach(GAttrib *attrib, gboolean out)
 	}
 
 	server = find_gatt_server(&channel->src);
-	if (server == NULL)
+	if (server == NULL) {
+		char src[18];
+
+		ba2str(&channel->src, src);
+		error("No GATT server found in %s", src);
+		g_free(channel);
 		return 0;
+	}
 
 	channel->server = server;
 
-- 
1.7.9

[PATCH 2/2] attrib-server: Fix bad error message

[Santiago Carot-Nemesio]

---
 src/attrib-server.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/attrib-server.c b/src/attrib-server.c
index e51f695..93a7b4f 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -171,7 +171,7 @@ static struct gatt_server *find_gatt_server(const bdaddr_t *bdaddr)
 		char addr[18];
 
 		ba2str(bdaddr, addr);
-		error("Not GATT adapter found for address %s", addr);
+		error("No GATT server found in %s", addr);
 		return NULL;
 	}
 
-- 
1.7.9

Re: [PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[Andrei Emeltchenko]

Hi Santiago,

On Tue, Feb 07, 2012 at 02:26:44PM +0100, Santiago Carot-Nemesio wrote:
> Channel is not being released when the channel is attached over
> an uninitialized GATT server.
> ---
>  src/attrib-server.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/src/attrib-server.c b/src/attrib-server.c
> index 2995167..e51f695 100644
> --- a/src/attrib-server.c
> +++ b/src/attrib-server.c
> @@ -1020,8 +1020,14 @@ guint attrib_channel_attach(GAttrib *attrib, gboolean out)
>  	}
>  
>  	server = find_gatt_server(&channel->src);
> -	if (server == NULL)
> +	if (server == NULL) {
> +		char src[18];

Don't we have a good define for this magic number? I saw it in several
places.

Best regards 
Andrei Emeltchenko 

Re: [PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[Santiago Carot]

Hi Andrei,

2012/2/8 Andrei Emeltchenko <andrei.emeltchenko.news@gmail.com>:
> Hi Santiago,
>
> On Tue, Feb 07, 2012 at 02:26:44PM +0100, Santiago Carot-Nemesio wrote:
>> Channel is not being released when the channel is attached over
>> an uninitialized GATT server.
>> ---
>>  src/attrib-server.c |    8 +++++++-
>>  1 files changed, 7 insertions(+), 1 deletions(-)
>>
>> diff --git a/src/attrib-server.c b/src/attrib-server.c
>> index 2995167..e51f695 100644
>> --- a/src/attrib-server.c
>> +++ b/src/attrib-server.c
>> @@ -1020,8 +1020,14 @@ guint attrib_channel_attach(GAttrib *attrib, gboolean out)
>>       }
>>
>>       server = find_gatt_server(&channel->src);
>> -     if (server == NULL)
>> +     if (server == NULL) {
>> +             char src[18];
>
> Don't we have a good define for this magic number? I saw it in several
> places.
>

That's a good point, I've also seen it in too many places but I don't
know if there is any macro for that, at least I didn't see it.

Regards.

Re: [PATCH 1/2] attrib-server: Fix memory leak attaching attribute channels

[Johan Hedberg]

Hi Santiago,

On Tue, Feb 07, 2012, Santiago Carot-Nemesio wrote:
> Channel is not being released when the channel is attached over
> an uninitialized GATT server.
> ---
>  src/attrib-server.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)

Both patches have been applied. Thanks.

Johan