From 8e4727f1ccc74dff32d2e4dd92e23c9bd0b3ab8b Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 28 Jun 2012 19:32:19 +0200 Subject: [PATCH] device: Free the pushed NDEF instead of offloading that to p2p plugins --- plugins/handover.c | 3 --- plugins/snep.c | 5 ----- src/device.c | 9 ++++----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/plugins/handover.c b/plugins/handover.c index f803643..634efdf 100644 --- a/plugins/handover.c +++ b/plugins/handover.c @@ -458,9 +458,6 @@ static int handover_push(int client_fd, if (err < 0) free_hr_push_client(client, err); - g_free(ndef); - g_free(ndef->data); - return err; } diff --git a/plugins/snep.c b/plugins/snep.c index ca9dba3..8a8c3b6 100644 --- a/plugins/snep.c +++ b/plugins/snep.c @@ -508,15 +508,10 @@ static int snep_push(int fd, uint32_t adapter_idx, uint32_t target_idx, g_free(fragment->data); g_free(fragment); - g_free(ndef->data); - g_free(ndef); return 0; error: - g_free(ndef->data); - g_free(ndef); - free_snep_push_data(req, err); return err; diff --git a/src/device.c b/src/device.c index e13f58e..ddad86f 100644 --- a/src/device.c +++ b/src/device.c @@ -275,12 +275,11 @@ static DBusMessage *push_ndef(DBusConnection *conn, } err = __near_device_push(device, ndef, service_name, push_cb); - if (err < 0) { - g_free(ndef->data); - g_free(ndef); - + if (err < 0) goto error; - } + + g_free(ndef); + g_free(ndef->data); return NULL; -- 2.7.4