* [PATCHv4 02/12] android/core: Use g_clear_error instead of free and assignment
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 03/12] tools/rctest: Remove unneeded return Andrei Emeltchenko
` (10 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
g_clear_error() frees err and set it to NULL. This fixes dead code
warnings from analyzers.
---
android/bluetooth.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/android/bluetooth.c b/android/bluetooth.c
index a2ab445..52d816f 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -290,8 +290,7 @@ static void load_adapter_config(void)
"General", "DiscoverableTimeout", &gerr);
if (gerr) {
adapter.discoverable_timeout = DEFAULT_DISCOVERABLE_TIMEOUT;
- g_error_free(gerr);
- gerr = NULL;
+ g_clear_error(&gerr);
}
g_key_file_free(key_file);
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 03/12] tools/rctest: Remove unneeded return
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 02/12] android/core: Use g_clear_error instead of free and assignment Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 04/12] tools/rctest: Remove dead code Andrei Emeltchenko
` (9 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Code is unreachable since we use exit() before
---
tools/rctest.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/rctest.c b/tools/rctest.c
index 2c7e45b..a09a973 100644
--- a/tools/rctest.c
+++ b/tools/rctest.c
@@ -437,8 +437,6 @@ static void do_listen(void (*handler)(int sk))
exit(0);
}
- return;
-
error:
close(sk);
exit(1);
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 04/12] tools/rctest: Remove dead code
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 02/12] android/core: Use g_clear_error instead of free and assignment Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 03/12] tools/rctest: Remove unneeded return Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 05/12] tools/scotest: Remove unneeded return Andrei Emeltchenko
` (8 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Since do_listen() never returns remove hanging code
---
tools/rctest.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/rctest.c b/tools/rctest.c
index a09a973..583b50c 100644
--- a/tools/rctest.c
+++ b/tools/rctest.c
@@ -629,19 +629,17 @@ static void automated_send_recv()
char device[18];
if (fork()) {
- if (!savefile) {
+ if (!savefile)
+ /* do_listen() never returns */
do_listen(recv_mode);
- return;
- }
save_fd = open(savefile, O_CREAT | O_WRONLY,
S_IRUSR | S_IWUSR);
if (save_fd < 0)
syslog(LOG_ERR, "Failed to open file to save data");
+ /* do_listen() never returns */
do_listen(save_mode);
-
- close(save_fd);
} else {
ba2str(&bdaddr, device);
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 05/12] tools/scotest: Remove unneeded return
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (2 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 04/12] tools/rctest: Remove dead code Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 06/12] tools/l2test: " Andrei Emeltchenko
` (7 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Remove dead code after exit()
---
tools/scotest.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/scotest.c b/tools/scotest.c
index e5530d9..bd65034 100644
--- a/tools/scotest.c
+++ b/tools/scotest.c
@@ -237,8 +237,6 @@ static void do_listen(void (*handler)(int sk))
exit(0);
}
- return;
-
error:
close(sk);
exit(1);
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 06/12] tools/l2test: Remove unneeded return
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (3 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 05/12] tools/scotest: Remove unneeded return Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 07/12] tools/scotest: Fix double close socket Andrei Emeltchenko
` (6 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Remove dead code after exit()
---
tools/l2test.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/l2test.c b/tools/l2test.c
index ffad7c4..67ca70a 100644
--- a/tools/l2test.c
+++ b/tools/l2test.c
@@ -768,8 +768,6 @@ static void do_listen(void (*handler)(int sk))
exit(0);
}
- return;
-
error:
close(sk);
exit(1);
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 07/12] tools/scotest: Fix double close socket
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (4 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 06/12] tools/l2test: " Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 08/12] android/ipc: Remove unneeded check Andrei Emeltchenko
` (5 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
When executing in a child we close(sk) in the beginning. error label
handles parent process error conditions.
---
tools/scotest.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/scotest.c b/tools/scotest.c
index bd65034..d033ae0 100644
--- a/tools/scotest.c
+++ b/tools/scotest.c
@@ -210,7 +210,7 @@ static void do_listen(void (*handler)(int sk))
strerror(errno), errno);
if (!defer_setup) {
close(nsk);
- goto error;
+ exit(1);
}
}
@@ -227,7 +227,7 @@ static void do_listen(void (*handler)(int sk))
if (defer_setup < 0) {
close(nsk);
- goto error;
+ exit(1);
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 08/12] android/ipc: Remove unneeded check
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (5 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 07/12] tools/scotest: Fix double close socket Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-07-29 14:20 ` [PATCHv4 09/12] tools: Fix memory leak Andrei Emeltchenko
` (4 subsequent siblings)
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
rsp_len cannot be NULL since it is checked above and dereferenced.
Remove static analyzers warnings.
---
android/hal-ipc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/android/hal-ipc.c b/android/hal-ipc.c
index 494ba85..363072c 100644
--- a/android/hal-ipc.c
+++ b/android/hal-ipc.c
@@ -462,8 +462,7 @@ int hal_ipc_cmd(uint8_t service_id, uint8_t opcode, uint16_t len, void *param,
}
}
- if (rsp_len)
- *rsp_len = cmd.len;
+ *rsp_len = cmd.len;
return BT_STATUS_SUCCESS;
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 09/12] tools: Fix memory leak
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (6 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 08/12] android/ipc: Remove unneeded check Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-08-01 10:35 ` Johan Hedberg
2014-07-29 14:20 ` [PATCHv4 10/12] obexd: " Andrei Emeltchenko
` (3 subsequent siblings)
11 siblings, 1 reply; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
lmpver and hciver are allocated through malloc and need to be freed.
---
tools/parser/hci.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index 351f843..1a639af 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
p_indent(level, frm);
printf("Error: %s\n", status2str(rp->status));
} else {
+ char *lmpver = lmp_vertostr(rp->lmp_ver);
+ char *hciver = hci_vertostr(rp->hci_ver);
+
p_indent(level, frm);
printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
- hci_vertostr(rp->hci_ver),
+ hciver ? hciver : "n/a",
rp->hci_ver, btohs(rp->hci_rev));
p_indent(level, frm);
printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
- lmp_vertostr(rp->lmp_ver),
+ lmpver ? lmpver : "n/a",
rp->lmp_ver, btohs(rp->lmp_subver));
p_indent(level, frm);
printf("Manufacturer: %s (%d)\n",
bt_compidtostr(manufacturer), manufacturer);
+
+ if (lmpver)
+ bt_free(lmpver);
+ if (hciver)
+ bt_free(hciver);
}
}
@@ -3178,13 +3186,18 @@ static inline void read_remote_version_complete_dump(int level, struct frame *fr
p_indent(level, frm);
printf("Error: %s\n", status2str(evt->status));
} else {
+ char *lmpver = lmp_vertostr(evt->lmp_ver);
+
p_indent(level, frm);
printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
- lmp_vertostr(evt->lmp_ver), evt->lmp_ver,
+ lmpver ? lmpver : "n/a", evt->lmp_ver,
btohs(evt->lmp_subver));
p_indent(level, frm);
printf("Manufacturer: %s (%d)\n",
bt_compidtostr(manufacturer), manufacturer);
+
+ if (lmpver)
+ bt_free(lmpver);
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCHv4 09/12] tools: Fix memory leak
2014-07-29 14:20 ` [PATCHv4 09/12] tools: Fix memory leak Andrei Emeltchenko
@ 2014-08-01 10:35 ` Johan Hedberg
2014-08-01 11:12 ` Andrei Emeltchenko
0 siblings, 1 reply; 52+ messages in thread
From: Johan Hedberg @ 2014-08-01 10:35 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> lmpver and hciver are allocated through malloc and need to be freed.
> ---
> tools/parser/hci.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
I've applied all 8 patches before this one.
> diff --git a/tools/parser/hci.c b/tools/parser/hci.c
> index 351f843..1a639af 100644
> --- a/tools/parser/hci.c
> +++ b/tools/parser/hci.c
> @@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
> p_indent(level, frm);
> printf("Error: %s\n", status2str(rp->status));
> } else {
> + char *lmpver = lmp_vertostr(rp->lmp_ver);
> + char *hciver = hci_vertostr(rp->hci_ver);
> +
> p_indent(level, frm);
> printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
> - hci_vertostr(rp->hci_ver),
> + hciver ? hciver : "n/a",
> rp->hci_ver, btohs(rp->hci_rev));
> p_indent(level, frm);
> printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
> - lmp_vertostr(rp->lmp_ver),
> + lmpver ? lmpver : "n/a",
> rp->lmp_ver, btohs(rp->lmp_subver));
> p_indent(level, frm);
> printf("Manufacturer: %s (%d)\n",
> bt_compidtostr(manufacturer), manufacturer);
> +
> + if (lmpver)
> + bt_free(lmpver);
> + if (hciver)
> + bt_free(hciver);
These trace back to using malloc (in hci_uint2str) so I suppose free is
more appropriate than bt_free (which should be used for bt_malloc).
Johan
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCHv4 09/12] tools: Fix memory leak
2014-08-01 10:35 ` Johan Hedberg
@ 2014-08-01 11:12 ` Andrei Emeltchenko
2014-08-01 11:21 ` Johan Hedberg
0 siblings, 1 reply; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:12 UTC (permalink / raw)
To: linux-bluetooth
Hi Johan,
On Fri, Aug 01, 2014 at 01:35:17PM +0300, Johan Hedberg wrote:
> Hi Andrei,
>
> On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> > lmpver and hciver are allocated through malloc and need to be freed.
> > ---
> > tools/parser/hci.c | 19 ++++++++++++++++---
> > 1 file changed, 16 insertions(+), 3 deletions(-)
>
> I've applied all 8 patches before this one.
>
> > diff --git a/tools/parser/hci.c b/tools/parser/hci.c
> > index 351f843..1a639af 100644
> > --- a/tools/parser/hci.c
> > +++ b/tools/parser/hci.c
> > @@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
> > p_indent(level, frm);
> > printf("Error: %s\n", status2str(rp->status));
> > } else {
> > + char *lmpver = lmp_vertostr(rp->lmp_ver);
> > + char *hciver = hci_vertostr(rp->hci_ver);
> > +
> > p_indent(level, frm);
> > printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
> > - hci_vertostr(rp->hci_ver),
> > + hciver ? hciver : "n/a",
> > rp->hci_ver, btohs(rp->hci_rev));
> > p_indent(level, frm);
> > printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
> > - lmp_vertostr(rp->lmp_ver),
> > + lmpver ? lmpver : "n/a",
> > rp->lmp_ver, btohs(rp->lmp_subver));
> > p_indent(level, frm);
> > printf("Manufacturer: %s (%d)\n",
> > bt_compidtostr(manufacturer), manufacturer);
> > +
> > + if (lmpver)
> > + bt_free(lmpver);
> > + if (hciver)
> > + bt_free(hciver);
>
> These trace back to using malloc (in hci_uint2str) so I suppose free is
> more appropriate than bt_free (which should be used for bt_malloc).
OK, I will change it to free(). Shall I also change other similar
bt_free() calls which I took as example?
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCHv4 09/12] tools: Fix memory leak
2014-08-01 11:12 ` Andrei Emeltchenko
@ 2014-08-01 11:21 ` Johan Hedberg
2014-08-01 11:27 ` Andrei Emeltchenko
0 siblings, 1 reply; 52+ messages in thread
From: Johan Hedberg @ 2014-08-01 11:21 UTC (permalink / raw)
To: Andrei Emeltchenko, linux-bluetooth
Hi Andrei,
On Fri, Aug 01, 2014, Andrei Emeltchenko wrote:
> Hi Johan,
>
> On Fri, Aug 01, 2014 at 01:35:17PM +0300, Johan Hedberg wrote:
> > Hi Andrei,
> >
> > On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> > > lmpver and hciver are allocated through malloc and need to be freed.
> > > ---
> > > tools/parser/hci.c | 19 ++++++++++++++++---
> > > 1 file changed, 16 insertions(+), 3 deletions(-)
> >
> > I've applied all 8 patches before this one.
> >
> > > diff --git a/tools/parser/hci.c b/tools/parser/hci.c
> > > index 351f843..1a639af 100644
> > > --- a/tools/parser/hci.c
> > > +++ b/tools/parser/hci.c
> > > @@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
> > > p_indent(level, frm);
> > > printf("Error: %s\n", status2str(rp->status));
> > > } else {
> > > + char *lmpver = lmp_vertostr(rp->lmp_ver);
> > > + char *hciver = hci_vertostr(rp->hci_ver);
> > > +
> > > p_indent(level, frm);
> > > printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
> > > - hci_vertostr(rp->hci_ver),
> > > + hciver ? hciver : "n/a",
> > > rp->hci_ver, btohs(rp->hci_rev));
> > > p_indent(level, frm);
> > > printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
> > > - lmp_vertostr(rp->lmp_ver),
> > > + lmpver ? lmpver : "n/a",
> > > rp->lmp_ver, btohs(rp->lmp_subver));
> > > p_indent(level, frm);
> > > printf("Manufacturer: %s (%d)\n",
> > > bt_compidtostr(manufacturer), manufacturer);
> > > +
> > > + if (lmpver)
> > > + bt_free(lmpver);
> > > + if (hciver)
> > > + bt_free(hciver);
> >
> > These trace back to using malloc (in hci_uint2str) so I suppose free is
> > more appropriate than bt_free (which should be used for bt_malloc).
>
> OK, I will change it to free(). Shall I also change other similar
> bt_free() calls which I took as example?
I'm not sure it's worth bothering with legacy code like this which will
eventually disappear from the tree.
Johan
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCHv4 09/12] tools: Fix memory leak
2014-08-01 11:21 ` Johan Hedberg
@ 2014-08-01 11:27 ` Andrei Emeltchenko
2014-08-01 11:33 ` Johan Hedberg
0 siblings, 1 reply; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:27 UTC (permalink / raw)
To: linux-bluetooth
Hi Johan,
On Fri, Aug 01, 2014 at 02:21:24PM +0300, Johan Hedberg wrote:
> Hi Andrei,
>
> On Fri, Aug 01, 2014, Andrei Emeltchenko wrote:
> > Hi Johan,
> >
> > On Fri, Aug 01, 2014 at 01:35:17PM +0300, Johan Hedberg wrote:
> > > Hi Andrei,
> > >
> > > On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> > > > lmpver and hciver are allocated through malloc and need to be freed.
> > > > ---
> > > > tools/parser/hci.c | 19 ++++++++++++++++---
> > > > 1 file changed, 16 insertions(+), 3 deletions(-)
> > >
> > > I've applied all 8 patches before this one.
> > >
> > > > diff --git a/tools/parser/hci.c b/tools/parser/hci.c
> > > > index 351f843..1a639af 100644
> > > > --- a/tools/parser/hci.c
> > > > +++ b/tools/parser/hci.c
> > > > @@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
> > > > p_indent(level, frm);
> > > > printf("Error: %s\n", status2str(rp->status));
> > > > } else {
> > > > + char *lmpver = lmp_vertostr(rp->lmp_ver);
> > > > + char *hciver = hci_vertostr(rp->hci_ver);
> > > > +
> > > > p_indent(level, frm);
> > > > printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
> > > > - hci_vertostr(rp->hci_ver),
> > > > + hciver ? hciver : "n/a",
> > > > rp->hci_ver, btohs(rp->hci_rev));
> > > > p_indent(level, frm);
> > > > printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
> > > > - lmp_vertostr(rp->lmp_ver),
> > > > + lmpver ? lmpver : "n/a",
> > > > rp->lmp_ver, btohs(rp->lmp_subver));
> > > > p_indent(level, frm);
> > > > printf("Manufacturer: %s (%d)\n",
> > > > bt_compidtostr(manufacturer), manufacturer);
> > > > +
> > > > + if (lmpver)
> > > > + bt_free(lmpver);
> > > > + if (hciver)
> > > > + bt_free(hciver);
> > >
> > > These trace back to using malloc (in hci_uint2str) so I suppose free is
> > > more appropriate than bt_free (which should be used for bt_malloc).
> >
> > OK, I will change it to free(). Shall I also change other similar
> > bt_free() calls which I took as example?
>
> I'm not sure it's worth bothering with legacy code like this which will
> eventually disappear from the tree.
Those constructions are in hcitool and hciconfig
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCHv4 09/12] tools: Fix memory leak
2014-08-01 11:27 ` Andrei Emeltchenko
@ 2014-08-01 11:33 ` Johan Hedberg
2014-08-01 11:54 ` Andrei Emeltchenko
0 siblings, 1 reply; 52+ messages in thread
From: Johan Hedberg @ 2014-08-01 11:33 UTC (permalink / raw)
To: Andrei Emeltchenko, linux-bluetooth
Hi Andrei,
On Fri, Aug 01, 2014, Andrei Emeltchenko wrote:
> On Fri, Aug 01, 2014 at 02:21:24PM +0300, Johan Hedberg wrote:
> > Hi Andrei,
> >
> > On Fri, Aug 01, 2014, Andrei Emeltchenko wrote:
> > > Hi Johan,
> > >
> > > On Fri, Aug 01, 2014 at 01:35:17PM +0300, Johan Hedberg wrote:
> > > > Hi Andrei,
> > > >
> > > > On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> > > > > lmpver and hciver are allocated through malloc and need to be freed.
> > > > > ---
> > > > > tools/parser/hci.c | 19 ++++++++++++++++---
> > > > > 1 file changed, 16 insertions(+), 3 deletions(-)
> > > >
> > > > I've applied all 8 patches before this one.
> > > >
> > > > > diff --git a/tools/parser/hci.c b/tools/parser/hci.c
> > > > > index 351f843..1a639af 100644
> > > > > --- a/tools/parser/hci.c
> > > > > +++ b/tools/parser/hci.c
> > > > > @@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
> > > > > p_indent(level, frm);
> > > > > printf("Error: %s\n", status2str(rp->status));
> > > > > } else {
> > > > > + char *lmpver = lmp_vertostr(rp->lmp_ver);
> > > > > + char *hciver = hci_vertostr(rp->hci_ver);
> > > > > +
> > > > > p_indent(level, frm);
> > > > > printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
> > > > > - hci_vertostr(rp->hci_ver),
> > > > > + hciver ? hciver : "n/a",
> > > > > rp->hci_ver, btohs(rp->hci_rev));
> > > > > p_indent(level, frm);
> > > > > printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
> > > > > - lmp_vertostr(rp->lmp_ver),
> > > > > + lmpver ? lmpver : "n/a",
> > > > > rp->lmp_ver, btohs(rp->lmp_subver));
> > > > > p_indent(level, frm);
> > > > > printf("Manufacturer: %s (%d)\n",
> > > > > bt_compidtostr(manufacturer), manufacturer);
> > > > > +
> > > > > + if (lmpver)
> > > > > + bt_free(lmpver);
> > > > > + if (hciver)
> > > > > + bt_free(hciver);
> > > >
> > > > These trace back to using malloc (in hci_uint2str) so I suppose free is
> > > > more appropriate than bt_free (which should be used for bt_malloc).
> > >
> > > OK, I will change it to free(). Shall I also change other similar
> > > bt_free() calls which I took as example?
> >
> > I'm not sure it's worth bothering with legacy code like this which will
> > eventually disappear from the tree.
>
> Those constructions are in hcitool and hciconfig
Still legacy code. If you really feel like there's nothing else
important to work on feel free to send patches for that.
Johan
^ permalink raw reply [flat|nested] 52+ messages in thread* Re: [PATCHv4 09/12] tools: Fix memory leak
2014-08-01 11:33 ` Johan Hedberg
@ 2014-08-01 11:54 ` Andrei Emeltchenko
0 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:54 UTC (permalink / raw)
To: linux-bluetooth
Hi Johan,
On Fri, Aug 01, 2014 at 02:33:10PM +0300, Johan Hedberg wrote:
> > > > > > + if (lmpver)
> > > > > > + bt_free(lmpver);
> > > > > > + if (hciver)
> > > > > > + bt_free(hciver);
> > > > >
> > > > > These trace back to using malloc (in hci_uint2str) so I suppose free is
> > > > > more appropriate than bt_free (which should be used for bt_malloc).
> > > >
> > > > OK, I will change it to free(). Shall I also change other similar
> > > > bt_free() calls which I took as example?
> > >
> > > I'm not sure it's worth bothering with legacy code like this which will
> > > eventually disappear from the tree.
> >
> > Those constructions are in hcitool and hciconfig
>
> Still legacy code. If you really feel like there's nothing else
> important to work on feel free to send patches for that.
The question is if we change some programming practice shall we make other
code looks consistent.
Best regards
Andrei Emeltchenko
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCHv4 10/12] obexd: Fix memory leak
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (7 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 09/12] tools: Fix memory leak Andrei Emeltchenko
@ 2014-07-29 14:20 ` Andrei Emeltchenko
2014-08-01 10:36 ` Johan Hedberg
2014-07-29 14:21 ` [PATCHv4 11/12] " Andrei Emeltchenko
` (2 subsequent siblings)
11 siblings, 1 reply; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:20 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Fixes memory leak for folder_listing_cb().
---
obexd/client/map.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index d2d3d81..331aebc 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -271,8 +271,10 @@ static void folder_listing_cb(struct obc_session *session,
}
reply = dbus_message_new_method_return(request->msg);
- if (reply == NULL)
+ if (reply == NULL) {
+ g_free(contents);
return;
+ }
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCHv4 10/12] obexd: Fix memory leak
2014-07-29 14:20 ` [PATCHv4 10/12] obexd: " Andrei Emeltchenko
@ 2014-08-01 10:36 ` Johan Hedberg
0 siblings, 0 replies; 52+ messages in thread
From: Johan Hedberg @ 2014-08-01 10:36 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> Fixes memory leak for folder_listing_cb().
> ---
> obexd/client/map.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/obexd/client/map.c b/obexd/client/map.c
> index d2d3d81..331aebc 100644
> --- a/obexd/client/map.c
> +++ b/obexd/client/map.c
> @@ -271,8 +271,10 @@ static void folder_listing_cb(struct obc_session *session,
> }
>
> reply = dbus_message_new_method_return(request->msg);
> - if (reply == NULL)
> + if (reply == NULL) {
> + g_free(contents);
> return;
> + }
Shouldn't you call pending_requesT_free(request) before returning?
Johan
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCHv4 11/12] obexd: Fix memory leak
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (8 preceding siblings ...)
2014-07-29 14:20 ` [PATCHv4 10/12] obexd: " Andrei Emeltchenko
@ 2014-07-29 14:21 ` Andrei Emeltchenko
2014-08-01 10:38 ` Johan Hedberg
2014-07-29 14:21 ` [PATCHv4 12/12] attrib: " Andrei Emeltchenko
2014-08-01 8:48 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
11 siblings, 1 reply; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:21 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Fixes memory leak for message_listing_cb()
---
obexd/client/map.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 331aebc..5d7f0dc 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -1182,8 +1182,10 @@ static void message_listing_cb(struct obc_session *session,
}
reply = dbus_message_new_method_return(request->msg);
- if (reply == NULL)
+ if (reply == NULL) {
+ g_free(contents);
return;
+ }
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCHv4 11/12] obexd: Fix memory leak
2014-07-29 14:21 ` [PATCHv4 11/12] " Andrei Emeltchenko
@ 2014-08-01 10:38 ` Johan Hedberg
2014-08-01 11:18 ` [PATCHv4 1/3] tools: " Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 1/3] tools: " Andrei Emeltchenko
0 siblings, 2 replies; 52+ messages in thread
From: Johan Hedberg @ 2014-08-01 10:38 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Tue, Jul 29, 2014, Andrei Emeltchenko wrote:
> Fixes memory leak for message_listing_cb()
> ---
> obexd/client/map.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/obexd/client/map.c b/obexd/client/map.c
> index 331aebc..5d7f0dc 100644
> --- a/obexd/client/map.c
> +++ b/obexd/client/map.c
> @@ -1182,8 +1182,10 @@ static void message_listing_cb(struct obc_session *session,
> }
>
> reply = dbus_message_new_method_return(request->msg);
> - if (reply == NULL)
> + if (reply == NULL) {
> + g_free(contents);
> return;
> + }
>
Here also there seems to be a missing call to pending_request_free().
Might be simplest if you simply replace the return with goto done and
then put the g_dbus_send_message call behind a NULL check (same applies
to the previous patch).
Johan
^ permalink raw reply [flat|nested] 52+ messages in thread* [PATCHv4 1/3] tools: Fix memory leak
2014-08-01 10:38 ` Johan Hedberg
@ 2014-08-01 11:18 ` Andrei Emeltchenko
2014-08-01 11:18 ` [PATCHv4 2/3] obexd: " Andrei Emeltchenko
2014-08-01 11:18 ` [PATCHv4 3/3] " Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 1/3] tools: " Andrei Emeltchenko
1 sibling, 2 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:18 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
lmpver and hciver are allocated through malloc and need to be freed.
---
tools/parser/hci.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index 351f843..cd52cb5 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
p_indent(level, frm);
printf("Error: %s\n", status2str(rp->status));
} else {
+ char *lmpver = lmp_vertostr(rp->lmp_ver);
+ char *hciver = hci_vertostr(rp->hci_ver);
+
p_indent(level, frm);
printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
- hci_vertostr(rp->hci_ver),
+ hciver ? hciver : "n/a",
rp->hci_ver, btohs(rp->hci_rev));
p_indent(level, frm);
printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
- lmp_vertostr(rp->lmp_ver),
+ lmpver ? lmpver : "n/a",
rp->lmp_ver, btohs(rp->lmp_subver));
p_indent(level, frm);
printf("Manufacturer: %s (%d)\n",
bt_compidtostr(manufacturer), manufacturer);
+
+ if (lmpver)
+ free(lmpver);
+ if (hciver)
+ free(hciver);
}
}
@@ -3178,13 +3186,18 @@ static inline void read_remote_version_complete_dump(int level, struct frame *fr
p_indent(level, frm);
printf("Error: %s\n", status2str(evt->status));
} else {
+ char *lmpver = lmp_vertostr(evt->lmp_ver);
+
p_indent(level, frm);
printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
- lmp_vertostr(evt->lmp_ver), evt->lmp_ver,
+ lmpver ? lmpver : "n/a", evt->lmp_ver,
btohs(evt->lmp_subver));
p_indent(level, frm);
printf("Manufacturer: %s (%d)\n",
bt_compidtostr(manufacturer), manufacturer);
+
+ if (lmpver)
+ free(lmpver);
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 2/3] obexd: Fix memory leak
2014-08-01 11:18 ` [PATCHv4 1/3] tools: " Andrei Emeltchenko
@ 2014-08-01 11:18 ` Andrei Emeltchenko
2014-08-01 11:18 ` [PATCHv4 3/3] " Andrei Emeltchenko
1 sibling, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:18 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Fixes memory leak for folder_listing_cb().
---
obexd/client/map.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index d2d3d81..0ef5e0f 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -271,8 +271,10 @@ static void folder_listing_cb(struct obc_session *session,
}
reply = dbus_message_new_method_return(request->msg);
- if (reply == NULL)
- return;
+ if (reply == NULL) {
+ g_free(contents);
+ goto clean;
+ }
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
@@ -288,6 +290,7 @@ static void folder_listing_cb(struct obc_session *session,
done:
g_dbus_send_message(conn, reply);
+clean:
pending_request_free(request);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv4 3/3] obexd: Fix memory leak
2014-08-01 11:18 ` [PATCHv4 1/3] tools: " Andrei Emeltchenko
2014-08-01 11:18 ` [PATCHv4 2/3] obexd: " Andrei Emeltchenko
@ 2014-08-01 11:18 ` Andrei Emeltchenko
1 sibling, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:18 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Fixes memory leak for message_listing_cb()
---
obexd/client/map.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 0ef5e0f..47afc31 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -1183,8 +1183,10 @@ static void message_listing_cb(struct obc_session *session,
}
reply = dbus_message_new_method_return(request->msg);
- if (reply == NULL)
- return;
+ if (reply == NULL) {
+ g_free(contents);
+ goto clean;
+ }
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
@@ -1211,6 +1213,7 @@ static void message_listing_cb(struct obc_session *session,
done:
g_dbus_send_message(conn, reply);
+clean:
pending_request_free(request);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCHv5 1/3] tools: Fix memory leak
2014-08-01 10:38 ` Johan Hedberg
2014-08-01 11:18 ` [PATCHv4 1/3] tools: " Andrei Emeltchenko
@ 2014-08-01 11:26 ` Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 2/3] obexd: " Andrei Emeltchenko
` (2 more replies)
1 sibling, 3 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:26 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
lmpver and hciver are allocated through malloc and need to be freed.
---
tools/parser/hci.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index 351f843..cd52cb5 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -2445,17 +2445,25 @@ static inline void read_local_version_dump(int level, struct frame *frm)
p_indent(level, frm);
printf("Error: %s\n", status2str(rp->status));
} else {
+ char *lmpver = lmp_vertostr(rp->lmp_ver);
+ char *hciver = hci_vertostr(rp->hci_ver);
+
p_indent(level, frm);
printf("HCI Version: %s (0x%x) HCI Revision: 0x%x\n",
- hci_vertostr(rp->hci_ver),
+ hciver ? hciver : "n/a",
rp->hci_ver, btohs(rp->hci_rev));
p_indent(level, frm);
printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
- lmp_vertostr(rp->lmp_ver),
+ lmpver ? lmpver : "n/a",
rp->lmp_ver, btohs(rp->lmp_subver));
p_indent(level, frm);
printf("Manufacturer: %s (%d)\n",
bt_compidtostr(manufacturer), manufacturer);
+
+ if (lmpver)
+ free(lmpver);
+ if (hciver)
+ free(hciver);
}
}
@@ -3178,13 +3186,18 @@ static inline void read_remote_version_complete_dump(int level, struct frame *fr
p_indent(level, frm);
printf("Error: %s\n", status2str(evt->status));
} else {
+ char *lmpver = lmp_vertostr(evt->lmp_ver);
+
p_indent(level, frm);
printf("LMP Version: %s (0x%x) LMP Subversion: 0x%x\n",
- lmp_vertostr(evt->lmp_ver), evt->lmp_ver,
+ lmpver ? lmpver : "n/a", evt->lmp_ver,
btohs(evt->lmp_subver));
p_indent(level, frm);
printf("Manufacturer: %s (%d)\n",
bt_compidtostr(manufacturer), manufacturer);
+
+ if (lmpver)
+ free(lmpver);
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv5 2/3] obexd: Fix memory leak
2014-08-01 11:26 ` [PATCHv5 1/3] tools: " Andrei Emeltchenko
@ 2014-08-01 11:26 ` Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 3/3] " Andrei Emeltchenko
2014-08-04 6:11 ` [PATCHv5 1/3] tools: " Johan Hedberg
2 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:26 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Fixes memory leak for folder_listing_cb().
---
obexd/client/map.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index d2d3d81..0ef5e0f 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -271,8 +271,10 @@ static void folder_listing_cb(struct obc_session *session,
}
reply = dbus_message_new_method_return(request->msg);
- if (reply == NULL)
- return;
+ if (reply == NULL) {
+ g_free(contents);
+ goto clean;
+ }
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
@@ -288,6 +290,7 @@ static void folder_listing_cb(struct obc_session *session,
done:
g_dbus_send_message(conn, reply);
+clean:
pending_request_free(request);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* [PATCHv5 3/3] obexd: Fix memory leak
2014-08-01 11:26 ` [PATCHv5 1/3] tools: " Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 2/3] obexd: " Andrei Emeltchenko
@ 2014-08-01 11:26 ` Andrei Emeltchenko
2014-08-04 6:11 ` [PATCHv5 1/3] tools: " Johan Hedberg
2 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 11:26 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Fixes memory leak for message_listing_cb()
---
obexd/client/map.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/obexd/client/map.c b/obexd/client/map.c
index 0ef5e0f..47afc31 100644
--- a/obexd/client/map.c
+++ b/obexd/client/map.c
@@ -1183,8 +1183,10 @@ static void message_listing_cb(struct obc_session *session,
}
reply = dbus_message_new_method_return(request->msg);
- if (reply == NULL)
- return;
+ if (reply == NULL) {
+ g_free(contents);
+ goto clean;
+ }
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
@@ -1211,6 +1213,7 @@ static void message_listing_cb(struct obc_session *session,
done:
g_dbus_send_message(conn, reply);
+clean:
pending_request_free(request);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCHv5 1/3] tools: Fix memory leak
2014-08-01 11:26 ` [PATCHv5 1/3] tools: " Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 2/3] obexd: " Andrei Emeltchenko
2014-08-01 11:26 ` [PATCHv5 3/3] " Andrei Emeltchenko
@ 2014-08-04 6:11 ` Johan Hedberg
2 siblings, 0 replies; 52+ messages in thread
From: Johan Hedberg @ 2014-08-04 6:11 UTC (permalink / raw)
To: Andrei Emeltchenko; +Cc: linux-bluetooth
Hi Andrei,
On Fri, Aug 01, 2014, Andrei Emeltchenko wrote:
> lmpver and hciver are allocated through malloc and need to be freed.
> ---
> tools/parser/hci.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
All three patches have been applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCHv4 12/12] attrib: Fix memory leak
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (9 preceding siblings ...)
2014-07-29 14:21 ` [PATCHv4 11/12] " Andrei Emeltchenko
@ 2014-07-29 14:21 ` Andrei Emeltchenko
2014-08-01 10:40 ` Johan Hedberg
2014-08-01 8:48 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
11 siblings, 1 reply; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-07-29 14:21 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
attrib/gatttool.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index bca7f69..db5da62 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -340,6 +340,7 @@ static gboolean characteristics_write(gpointer user_data)
gatt_write_cmd(attrib, opt_handle, value, len, mainloop_quit, value);
+ g_free(value);
return FALSE;
error:
@@ -393,6 +394,7 @@ static gboolean characteristics_write_req(gpointer user_data)
gatt_write_char(attrib, opt_handle, value, len, char_write_req_cb,
NULL);
+ g_free(value);
return FALSE;
error:
--
1.9.1
^ permalink raw reply related [flat|nested] 52+ messages in thread* Re: [PATCHv4 01/12] core: Remove unneeded assignment
2014-07-29 14:20 ` [PATCHv4 01/12] core: Remove unneeded assignment Andrei Emeltchenko
` (10 preceding siblings ...)
2014-07-29 14:21 ` [PATCHv4 12/12] attrib: " Andrei Emeltchenko
@ 2014-08-01 8:48 ` Andrei Emeltchenko
11 siblings, 0 replies; 52+ messages in thread
From: Andrei Emeltchenko @ 2014-08-01 8:48 UTC (permalink / raw)
To: linux-bluetooth
ping
On Tue, Jul 29, 2014 at 05:20:50PM +0300, Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
>
> Variable rfcomm is never used after assignment
> ---
> src/profile.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/src/profile.c b/src/profile.c
> index 528525a..7aca3be 100644
> --- a/src/profile.c
> +++ b/src/profile.c
> @@ -1272,7 +1272,6 @@ static uint32_t ext_start_servers(struct ext_profile *ext,
> error("RFCOMM server failed for %s: %s",
> ext->name, err->message);
> g_free(rfcomm);
> - rfcomm = NULL;
> g_clear_error(&err);
> goto failed;
> } else {
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 52+ messages in thread