Resolve memory leak in HAL

[platform/core/connectivity/bluetooth-frwk.git] / bt-oal / bluez_hal / src / bt-hal-dbus-common-utils.c

diff --git a/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c b/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c
index aba8e3c..730fde4 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c
+++ b/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c
@@ -144,8 +144,6 @@ static GDBusProxy *__bt_hal_init_manager_proxy(void)
 {
        GDBusProxy *proxy;
 
-       DBG("+");
-
        if (system_conn == NULL) {
                system_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
                if (system_conn == NULL)
@@ -161,7 +159,6 @@ static GDBusProxy *__bt_hal_init_manager_proxy(void)
 
        manager_gproxy = proxy;
 
-       DBG("-");
        return proxy;
 }
 
@@ -276,17 +273,23 @@ static char *__bt_hal_extract_control_device_path(GVariantIter *iter, char *addr
 {
        char *object_path = NULL;
        char *interface_str = NULL;
+       GVariantIter *interface_iter;
        char device_address[BT_HAL_ADDRESS_STRING_SIZE] = { 0 };
 
        /* Parse the signature: oa{sa{sv}}} */
-       while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path, &interface_str)) {
+       while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path, &interface_iter)) {
                if (object_path == NULL)
-                       return  NULL;
+                       continue;
 
-               if (g_strcmp0(interface_str, BT_HAL_PLAYER_CONTROL_INTERFACE) == 0) {
-                       _bt_hal_convert_device_path_to_address(object_path, device_address);
-                       if (g_strcmp0(address, device_address) == 0)
-                               return g_strdup(object_path);
+               while(g_variant_iter_loop(interface_iter, "{&sa{sv}}", &interface_str, NULL)) {
+                       if (g_strcmp0(interface_str, BT_HAL_PLAYER_CONTROL_INTERFACE) == 0) {
+                               _bt_hal_convert_device_path_to_address(object_path, device_address);
+                               if (g_strcmp0(address, device_address) == 0) {
+                                       DBG("Object Path: %s", object_path);
+                                       g_variant_iter_free(interface_iter);
+                                       return g_strdup(object_path);
+                               }
+                       }
                }
        }
        return NULL;
@@ -296,17 +299,23 @@ static char *__bt_hal_extract_transport_device_path(GVariantIter *iter, char *ad
 {
        char *object_path = NULL;
        char *interface_str = NULL;
+       GVariantIter *interface_iter;
        char device_address[BT_HAL_ADDRESS_STRING_SIZE] = { 0 };
 
        /* Parse the signature: oa{sa{sv}}} */
-       while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path, &interface_str)) {
+       while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path, &interface_iter)) {
                if (object_path == NULL)
-                       return  NULL;
+                       continue;
 
-               if (g_strcmp0(interface_str, BT_HAL_MEDIATRANSPORT_INTERFACE) == 0) {
-                       _bt_hal_convert_device_path_to_address(object_path, device_address);
-                       if (g_strcmp0(address, device_address) == 0)
-                               return g_strdup(object_path);
+               while(g_variant_iter_loop(interface_iter, "{&sa{sv}}", &interface_str, NULL)) {
+                       if (g_strcmp0(interface_str, BT_HAL_MEDIATRANSPORT_INTERFACE) == 0) {
+                               _bt_hal_convert_device_path_to_address(object_path, device_address);
+                               if (g_strcmp0(address, device_address) == 0) {
+                                       DBG("Object Path: %s", object_path);
+                                       g_variant_iter_free(interface_iter);
+                                       return g_strdup(object_path);
+                               }
+                       }
                }
        }
        return NULL;
@@ -387,15 +396,11 @@ char *_bt_hal_get_control_device_path(bt_bdaddr_t *bd_addr)
        char *control_path;
        char connected_address[BT_HAL_ADDRESS_STRING_SIZE];
 
-       DBG("+");
-
        if (avrcp_control_path != NULL)
                return avrcp_control_path;
 
        _bt_hal_convert_addr_type_to_string(connected_address, bd_addr->address);
 
-       DBG("device address = %s", connected_address);
-
        control_path = __bt_hal_get_control_device_object_path(connected_address);
        if (control_path == NULL)
                return NULL;
@@ -410,15 +415,11 @@ char *_bt_hal_get_transport_device_path(bt_bdaddr_t *bd_addr)
        char *transport_path;
        char connected_address[BT_HAL_ADDRESS_STRING_SIZE];
 
-       DBG("+");
-
        if (avrcp_transport_path != NULL)
                return avrcp_transport_path;
 
        _bt_hal_convert_addr_type_to_string(connected_address, bd_addr->address);
 
-       DBG("device address = %s", connected_address);
-
        transport_path = __bt_hal_get_transport_device_object_path(connected_address);
        if (transport_path == NULL)
                return NULL;
@@ -471,7 +472,6 @@ static GDBusProxy *__bt_hal_init_avrcp_ctrl_proxy(bt_bdaddr_t *bd_addr)
 
 GDBusProxy *_bt_hal_get_manager_proxy(void)
 {
-       DBG("+");
        if (manager_gproxy) {
                const gchar *path =  g_dbus_proxy_get_object_path(manager_gproxy);
                if (path == NULL) {
@@ -480,7 +480,6 @@ GDBusProxy *_bt_hal_get_manager_proxy(void)
                }
                return manager_gproxy;
        }
-       DBG("-");
        return  __bt_hal_init_manager_proxy();
 }
 
@@ -531,7 +530,6 @@ GDBusProxy *_bt_hal_get_avrcp_ctrl_properties_proxy(bt_bdaddr_t *bd_addr)
        char *control_path = NULL;
        GDBusConnection *conn = NULL;
 
-       DBG("+");
        control_path = _bt_hal_get_control_device_path(bd_addr);
        if (control_path == NULL)
                return  NULL;
@@ -556,7 +554,6 @@ GDBusProxy *_bt_hal_get_avrcp_ctrl_properties_proxy(bt_bdaddr_t *bd_addr)
                return NULL;
        }
 
-       DBG("-");
        return proxy;
 }
 
@@ -567,7 +564,6 @@ GDBusProxy *_bt_hal_get_avrcp_transport_properties_proxy(bt_bdaddr_t *bd_addr)
        char *transport_path = NULL;
        GDBusConnection *conn = NULL;
 
-       DBG("+");
        transport_path = _bt_hal_get_transport_device_path(bd_addr);
        if (transport_path == NULL)
                return  NULL;
@@ -592,7 +588,6 @@ GDBusProxy *_bt_hal_get_avrcp_transport_properties_proxy(bt_bdaddr_t *bd_addr)
                return NULL;
        }
 
-       DBG("-");
        return proxy;
 }
 
@@ -667,7 +662,6 @@ char *_bt_hal_get_adapter_path(void)
        GVariantIter *iter = NULL;
        char *adapter_path = NULL;
 
-       DBG("+");
        conn = _bt_hal_get_system_gconn();
        if (conn == NULL)
                return  NULL;
@@ -693,7 +687,7 @@ char *_bt_hal_get_adapter_path(void)
        adapter_path = __bt_hal_extract_adapter_path(iter);
        g_variant_iter_free(iter);
        g_variant_unref(result);
-       DBG("-");
+
        return adapter_path;
 }
 
@@ -970,7 +964,6 @@ int _bt_hal_copy_utf8_string(char *dest, const char *src, unsigned int length)
 
 gboolean _bt_hal_utf8_validate(char *name)
 {
-       DBG("+");
        gunichar2 *u16;
        glong items_written = 0;
 
@@ -986,7 +979,6 @@ gboolean _bt_hal_utf8_validate(char *name)
        if (items_written != g_utf8_strlen(name, -1))
                return FALSE;
 
-       DBG("-");
        return TRUE;
 }
 
@@ -1090,7 +1082,6 @@ GVariant *_bt_hal_get_managed_objects(void)
        GVariant *result = NULL;
        GError *error = NULL;
 
-       DBG("+");
        conn = _bt_hal_get_system_gconn();
        if (conn == NULL)
                return NULL;
@@ -1755,8 +1746,6 @@ int _bt_hal_discover_service_uuids(char *address, char *remote_uuid)
        GVariant *ret = NULL;
        int result = BT_STATUS_FAIL;
 
-       DBG("+");
-
        if (remote_uuid == NULL) {
                ERR("remote_uuid == NULL, return");
                return BT_STATUS_FAIL;
@@ -1843,7 +1832,6 @@ done:
        if (uuid_value)
                g_free(uuid_value);
 
-       DBG("-");
        return result;
 }
 
@@ -1963,8 +1951,6 @@ gboolean _bt_hal_is_service_enabled(const char *uuid)
        gchar *uuid_str;
        gboolean ret = FALSE;
 
-       DBG("+");
-
        proxy = _bt_hal_get_adapter_properties_proxy();
        if (!proxy) {
                DBG("_bt_hal_dbus_get_local_name: Adapter Properties proxy get failed!!!");
@@ -1993,7 +1979,7 @@ gboolean _bt_hal_is_service_enabled(const char *uuid)
                return FALSE;
        }
 
-       while (g_variant_iter_loop(iter, "s", &uuid_str)) {
+       while (g_variant_iter_loop(iter, "&s", &uuid_str)) {
                DBG("UUID string [%s]\n", uuid_str);
                if (!strncasecmp(uuid, uuid_str, strlen(uuid))) {
                        ret = TRUE;
@@ -2004,6 +1990,6 @@ gboolean _bt_hal_is_service_enabled(const char *uuid)
        g_variant_iter_free(iter);
        g_variant_unref(result);
        g_variant_unref(temp);
-       DBG("-");
+
        return ret;
 }