Freeing found_devices list on end of standard/periodic inquiry.

2 files changed, 19 insertions, 37 deletions

diff --git a/src/adapter.c b/src/adapter.c
index bc49090c..43f0521f 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2739,6 +2739,21 @@ void adapter_set_state(struct adapter *adapter, int state)
 	if (!adapter)
 		return;
 
+	/* Both Standard and periodic Inquiry are in progress */
+	if ((state & STD_INQUIRY) && (state & PERIODIC_INQUIRY))
+		goto set;
+
+	if (!adapter->found_devices)
+		goto set;
+
+	/* Free list if standard/periodic inquiry is done */
+	if ((adapter->state & (STD_INQUIRY | PERIODIC_INQUIRY)) &&
+			(state & (~STD_INQUIRY | ~PERIODIC_INQUIRY))) {
+		g_slist_foreach(adapter->found_devices, (GFunc) g_free, NULL);
+		g_slist_free(adapter->found_devices);
+		adapter->found_devices = NULL;
+	}
+set:
 	adapter->state = state;
 }
 
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index 5e6285ac..e349cacf 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -1003,11 +1003,6 @@ void hcid_dbus_inquiry_complete(bdaddr_t *local)
 		adapter_set_state(adapter, state);
 	}
 
-	/* free discovered devices list */
-	g_slist_foreach(adapter->found_devices, (GFunc) g_free, NULL);
-	g_slist_free(adapter->found_devices);
-	adapter->found_devices = NULL;
-
 	if (adapter->discov_requestor) {
 		g_dbus_remove_watch(connection, adapter->discov_listener);
 		adapter->discov_listener = 0;
@@ -1091,11 +1086,6 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status)
 	state &= ~(PERIODIC_INQUIRY | RESOLVE_NAME);
 	adapter_set_state(adapter, state);
 
-	/* free discovered devices list */
-	g_slist_foreach(adapter->found_devices, (GFunc) g_free, NULL);
-	g_slist_free(adapter->found_devices);
-	adapter->found_devices = NULL;
-
 	/* free out of range devices list */
 	g_slist_foreach(adapter->oor_devices, (GFunc) free, NULL);
 	g_slist_free(adapter->oor_devices);
@@ -1390,11 +1380,6 @@ void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status,
 	if (!found_device_req_name(adapter))
 		return; /* skip if a new request has been sent */
 
-	/* free discovered devices list */
-	g_slist_foreach(adapter->found_devices, (GFunc) g_free, NULL);
-	g_slist_free(adapter->found_devices);
-	adapter->found_devices = NULL;
-
 	/* The discovery completed signal must be sent only for discover
 	 * devices request WITH name resolving */
 	if (adapter->discov_requestor) {
@@ -1971,14 +1956,6 @@ int cancel_discovery(struct adapter *adapter)
 	hci_close_dev(dd);
 
 cleanup:
-	/*
-	 * Reset discov_requestor and discover_state in the remote name
-	 * request event handler or in the inquiry complete handler.
-	 */
-	g_slist_foreach(adapter->found_devices, (GFunc) g_free, NULL);
-	g_slist_free(adapter->found_devices);
-	adapter->found_devices = NULL;
-
 	/* Disable name resolution for non D-Bus clients */
 	if (!adapter->pdiscov_requestor) {
 		state = adapter_get_state(adapter);
@@ -2020,13 +1997,12 @@ int cancel_periodic_discovery(struct adapter *adapter)
 	uint16_t dev_id = adapter_get_dev_id(adapter);
 
 	if (!(adapter_get_state(adapter) & PERIODIC_INQUIRY))
-		goto cleanup;
+		return err;
 
 	dd = hci_open_dev(dev_id);
-	if (dd < 0) {
-		err = -ENODEV;
-		goto cleanup;
-	}
+	if (dd < 0)
+		return -ENODEV;
+
 	/* find the pending remote name request */
 	memset(&match, 0, sizeof(struct remote_dev_info));
 	bacpy(&match.bdaddr, BDADDR_ANY);
@@ -2053,15 +2029,6 @@ int cancel_periodic_discovery(struct adapter *adapter)
 
 	hci_close_dev(dd);
 
-cleanup:
-	/*
-	 * Reset pdiscov_requestor and pdiscov_active is done when the
-	 * cmd complete event for exit periodic inquiry mode cmd arrives.
-	 */
-	g_slist_foreach(adapter->found_devices, (GFunc) g_free, NULL);
-	g_slist_free(adapter->found_devices);
-	adapter->found_devices = NULL;
-
 	return err;
 }