device: Free the pushed NDEF instead of offloading that to p2p plugins

diff --git a/plugins/handover.c b/plugins/handover.c
index f803643..634efdf 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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;