Avoid possible memory leak in mcap_connect_mdl function
PATCH 1/2 Avoid possible memory leak in mcap_connect_mdl function
--- health/mcap.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-)
health/mcap.c +17 -1
@@ -1592,6 +1592,22 @@ static void mcap_connect_mdl_cb(GIOChannel *chan, GError *conn_err,cb (mdl, conn_err, user_data); } +static void mdl_io_destroy (gpointer data) +{ +struct mcap_mdl_op_cb *con = data; +struct mcap_mdl *mdl = con->mdl; +mcap_mdl_operation_cb cb = con->cb.op; +gpointer user_data = con->user_data; +GError *err =NULL ; + +g_free (con); +g_set_error (&err,MCAP_ERROR ,MCAP_ERROR_FAILED ,"Connection error" ); + mdl->state =MDL_CLOSED ; +g_io_channel_unref (mdl->dc); + mdl->dc =NULL ; +cb (mdl, err, user_data); +} + gboolean mcap_connect_mdl(struct mcap_mdl *mdl, BtIOType BtType, uint16_t dcpsm, mcap_mdl_operation_cb connect_cb,
@@ -1613,7 +1629,7 @@ gboolean mcap_connect_mdl(struct mcap_mdl *mdl, BtIOType BtType,/* TODO: Check if BtIOType is ERTM or Streaming before continue */ mdl->dc = bt_io_connect(BtType, mcap_connect_mdl_cb, con, - NULL, err, + mdl_io_destroy, err, BT_IO_OPT_SOURCE_BDADDR, &mdl->mcl->ms->src, BT_IO_OPT_DEST_BDADDR, &mdl->mcl->addr, BT_IO_OPT_PSM, dcpsm,
Signature · 1 line
1.7.0.4
PATCH 1/1 Avoid possible memory leak in mcap_create_mcl function
--- health/mcap.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-)
health/mcap.c +20 -1
@@ -1755,6 +1755,25 @@ static void connect_dc_event_cb(GIOChannel *chan, GError *err, mcl->cb->mdl_connected (mdl, mcl->cb->user_data); } +static void mcl_io_destroy (gpointer data) +{ +struct connect_mcl *con = data; +struct mcap_mcl *mcl = con->mcl; +mcap_mcl_connect_cb connect_cb = con->connect_cb; +gpointer user_data = con->user_data; +GError *err =NULL ; + +g_free (con); + + mcl->ctrl &= ~MCAP_CTRL_CONN ; + +if (mcl->ctrl &MCAP_CTRL_FREE ) + mcl->ms->mcl_uncached_cb (mcl, mcl->ms->user_data); +mcap_mcl_check_del (mcl); +g_set_error (&err,MCAP_ERROR ,MCAP_ERROR_FAILED ,"Connection error" ); +connect_cb (NULL , err, user_data); +} + gboolean mcap_create_mcl(struct mcap_instance *ms, const bdaddr_t *addr, uint16_t ccpsm,
@@ -1790,7 +1809,7 @@ gboolean mcap_create_mcl(struct mcap_instance *ms, con->user_data = user_data; mcl->cc = bt_io_connect(BT_IO_L2CAP, mcap_connect_mcl_cb, con, - NULL, err, + mcl_io_destroy, err, BT_IO_OPT_SOURCE_BDADDR, &ms->src, BT_IO_OPT_DEST_BDADDR, addr, BT_IO_OPT_PSM, ccpsm,
Signature · 1 line
1.7.0.4
Re: [PATCH] Avoid possible memory leak in mcap_create_mcl function
Hi,
Quoted 35 lines · El Friday 03 September 2010 10:33:59 Santiago Carot-Nemesio escribió:
--- health/mcap.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-)health/mcap.c +19
-0@@ -1755,6 +1755,25 @@ static void connect_dc_event_cb(GIOChannel *chan, GError *err, mcl->cb->mdl_connected (mdl, mcl->cb->user_data); } +static void mcl_io_destroy (gpointer data) +{ +struct connect_mcl *con = data; +struct mcap_mcl *mcl = con->mcl; +mcap_mcl_connect_cb connect_cb = con->connect_cb; +gpointer user_data = con->user_data; +GError *err =NULL ; + +g_free (con); + + mcl->ctrl &= ~MCAP_CTRL_CONN ; + +if (mcl->ctrl &MCAP_CTRL_FREE ) + mcl->ms->mcl_uncached_cb (mcl, mcl->ms->user_data); +mcap_mcl_check_del (mcl); +g_set_error (&err,MCAP_ERROR ,MCAP_ERROR_FAILED ,"Connection error" ); +connect_cb (NULL , err, user_data); +} + gboolean mcap_create_mcl(struct mcap_instance *ms, const bdaddr_t *addr, uint16_t ccpsm,
health/mcap.c gboolean mcap_create_mcl(struct mcap_instance *ms, · line 1815
Quoted 8 lines
health/mcap.c +1
-1@@ -1790,7 +1809,7 @@ gboolean mcap_create_mcl(struct mcap_instance *ms, con->user_data = user_data; mcl->cc = bt_io_connect(BT_IO_L2CAP, mcap_connect_mcl_cb, con, - NULL, err, + mcl_io_destroy, err, BT_IO_OPT_SOURCE_BDADDR, &ms->src, BT_IO_OPT_DEST_BDADDR, addr, BT_IO_OPT_PSM, ccpsm,
We've just found a bug caused by this two patches, please do not apply them yet.
Regards.