From: Pyun DoHyun <dh79.pyun@samsung.com>
Date: Wed, 6 May 2020 03:46:31 +0000 (+0000)
Subject: Merge "Fix: advertisinog stopped suddenly" into tizen
X-Git-Tag: submit/tizen/20200506.041322^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8df3cf86bbb9854a8172564b63a143557cd634dc;hp=80b568c60e922e1e0948960509998bb2e835c39c;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

Merge "Fix: advertisinog stopped suddenly" into tizen
---

diff --git a/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c b/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c
index 6be2303..5f146f3 100644
--- a/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c
+++ b/bt-service-adaptation/services/adapter/bt-service-core-adapter-le.c
@@ -2136,14 +2136,16 @@ void _bt_check_le_scanner_app_termination(const char *sender)
 	if (!scanner)
 		return;
 
-	if (scanner->is_scanning)
-		_bt_stop_le_scan(sender);
-
 	_bt_bm_remove_scan_app(SCAN_LE, scanner->uid, scanner->pid);
 
+	if (scanner->is_scanning) {
+		/* Free 'scanner' into the function */
+		if (_bt_stop_le_scan(sender) != BLUETOOTH_ERROR_NOT_IN_OPERATION)
+			return;
+	}
+
 	scanner_list = g_slist_remove(scanner_list, scanner);
-	g_free(scanner->sender);
-	g_free(scanner);
+	__bt_free_le_scanner(scanner);
 }
 
 int _bt_service_le_init(void)