Revert "Fix crash issue when destroying notify io"

This reverts commit 50734b06177e2160c3309dfc3aad3aed9b766e39.

Change-Id: I1f0a72a0806df969ff011151e278af09c213164d

diff --git a/src/gatt-client.c b/src/gatt-client.c
index 8341a3100a5e7b8a103a1bd029fea496fef12392..977926af572fed6d1a137305c1405e35ebb2bf16 100644 (file)
--- a/src/gatt-client.c
+++ b/src/gatt-client.c
@@ -1734,6 +1734,12 @@ static DBusMessage *characteristic_acquire_notify(DBusConnection *conn,
        if (!client)
                return btd_error_failed(msg, "Failed allocate notify session");
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       chrc->notify_io = new0(struct sock_io, 1);
+       chrc->notify_io->data = client;
+       chrc->notify_io->msg = dbus_message_ref(msg);
+       chrc->notify_io->destroy = notify_io_destroy;
+#endif
        client->notify_id = bt_gatt_client_register_notify(gatt,
                                                chrc->value_handle,
                                                register_notify_io_cb,
@@ -1741,6 +1747,11 @@ static DBusMessage *characteristic_acquire_notify(DBusConnection *conn,
                                                client, NULL);
        if (!client->notify_id) {
                notify_client_unref(client);
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+               dbus_message_unref(chrc->notify_io->msg);
+               g_free(chrc->notify_io);
+               chrc->notify_io = NULL;
+#endif
                return btd_error_failed(msg, "Failed to subscribe");
        }
 
@@ -1750,10 +1761,12 @@ static DBusMessage *characteristic_acquire_notify(DBusConnection *conn,
        DBG("Added client to notify_clients. length: %d", queue_length(chrc->notify_clients));
 #endif
 
+#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
        chrc->notify_io = new0(struct sock_io, 1);
        chrc->notify_io->data = client;
        chrc->notify_io->msg = dbus_message_ref(msg);
        chrc->notify_io->destroy = notify_io_destroy;
+#endif
 
        return NULL;
 }