Fix the svace issue - DEREF_AFTER_NULL

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-event-handler.c

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index b213807..9285a83 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -474,6 +474,9 @@ void __bt_adapter_event_filter(GDBusConnection *connection,
                data->session_end_time = info->session_end_time;
                data->session_scan_time = info->session_scan_time;
                data->session_connected_time = info->session_connected_time;
+               data->tx_time = info->tx_time;
+               data->rx_time = info->rx_time;
+               data->idle_time = info->idle_time;
                data->atm_list = NULL;
 
                BT_INFO("Received battery data in bt-api: %ld %ld %d %d.",
@@ -1386,7 +1389,24 @@ void __bt_headset_event_filter(GDBusConnection *connection,
                _bt_headset_event_cb(BLUETOOTH_EVENT_AG_MIC_GAIN,
                                result, &gain,
                                event_info->cb, event_info->user_data);
+#ifdef TIZEN_FEATURE_BT_AVC_TARGET
+       } else if (strcasecmp(signal_name, BT_AUDIO_AVC_MODE_CHANGED) == 0) {
+               bool mode;
+
+               g_variant_get(parameters, "(b)", &mode);
+
+               _bt_headset_event_cb(BLUETOOTH_EVENT_AUDIO_AVC_STATUS,
+                               result, &mode,
+                               event_info->cb, event_info->user_data);
+       } else if (strcasecmp(signal_name, BT_MEDIA_VOLUME_CHANGE) == 0) {
+               unsigned int volume;
+
+               g_variant_get(parameters, "(u)", &volume);
+               _bt_avrcp_event_cb(BLUETOOTH_EVENT_AVRCP_VOLUME_CHANGED,
+                               result, &volume,
+                               event_info->cb, event_info->user_data);
        }
+#endif
 }
 
 void __bt_hid_device_event_filter(GDBusConnection *connection,
@@ -2247,6 +2267,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection,
                }
                g_free(folders_struct.names);
 
+               g_variant_iter_free(iter);
                g_variant_unref(folder_list_var);
 
        } else if (strcasecmp(signal_name, BT_MAP_FILTER_FIELDS_COMPLETE) == 0) {
@@ -2275,6 +2296,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection,
                                fields_info.fields[i] = strdup(field);
                                i++;
                        }
+                       g_variant_iter_free(iter);
                }
 
                _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE,
@@ -2405,9 +2427,12 @@ void __bt_map_client_event_filter(GDBusConnection *connection,
                                        messages_struct.message_items[i].is_protected = value_bool ? 1 : 0;
                                        BT_DBG("  Protected: %s", value_bool ? "true" : "false");
                                }
+
+                               g_free(value_string);
                        }
                        ++i;
                }
+               g_variant_iter_free(iter);
 
                _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_MESSAGES_COMPLETE,
                                result, &messages_struct,
@@ -3818,25 +3843,24 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                g_variant_unref(svc_uuid_var);
                g_variant_unref(char_uuid_var);
                g_variant_unref(desc_uuid_var);
-
        } else if (strcasecmp(signal_name, BT_GATT_CLIENT_SERVICE_CHANGED) == 0) {
-               BT_DBG("GATT Client event[BT_GATT_CLIENT_SERVICE_CHANGED]");
                bt_gatt_service_change_t change = {0, };
                char *address_str = NULL;
                char *name = NULL;
 
-               g_variant_get(parameters, "(i&s&s)", &change.change_type, &address_str, &change.uuid);
+               g_variant_get(parameters, "(ii&s&s)", &change.inst_id, &change.change_type, &address_str, &change.uuid);
 
                _bt_convert_addr_string_to_type(change.device_addr.addr, address_str);
-               bluetooth_get_uuid_name(change.uuid, &name);
-               BT_INFO(" ### GATT Service %s [%s]", change.change_type ? "Added" : "Removed", name);
-               g_free(name);
 
                if (_bluetooth_gatt_check_service_change_watcher_address(&change.device_addr) == FALSE) {
-                       BT_INFO("No watcher for %s", address_str);
+                       BT_INFO("GATT Service changed, but no watcher for %s", address_str);
                        return;
                }
 
+               bluetooth_get_uuid_name(change.uuid, &name);
+               BT_INFO(" ### GATT Service %s [%s]", change.change_type ? "Added" : "Removed", name);
+               g_free(name);
+
                _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_SERVICE_CHANGED,
                                BLUETOOTH_ERROR_NONE, &change,
                                event_info->cb, event_info->user_data);