Fix the crash issue when name changed

Change-Id: Ie2f9290f250d1def551c6c31272970c832ce36ed

diff --git a/bt-service/services/adapter/bt-service-core-adapter-le.c b/bt-service/services/adapter/bt-service-core-adapter-le.c
index 067ade046ee2d1377475e793b775f8e0d0c68c0b..64fa37f9c7583ba3acd9cd37ee026df8833c0e52 100644 (file)
--- a/bt-service/services/adapter/bt-service-core-adapter-le.c
+++ b/bt-service/services/adapter/bt-service-core-adapter-le.c
@@ -2303,6 +2303,8 @@ void _bt_check_le_scanner_app_termination(const char *sender)
 {
        bt_adapter_le_scanner_t *scanner;
 
+       ret_if(NULL == sender);
+
        scanner = __bt_find_scanner_from_list(sender);
        if (!scanner)
                return;

diff --git a/bt-service/services/bt-request-handler.c b/bt-service/services/bt-request-handler.c
index 261cd3765e2b79f216fc6a6a223305d75b8f266b..a16a1d500a39ff6f12c9f7648e9810c7a658b930 100644 (file)
--- a/bt-service/services/bt-request-handler.c
+++ b/bt-service/services/bt-request-handler.c
@@ -5329,7 +5329,7 @@ static void __name_owner_changed(GDBusConnection *connection,
        const char *new_owner = NULL;
 
        g_variant_get(parameters, "(&s&s&s)", &name, &old_owner, &new_owner);
-       if (*new_owner != '\0')
+       if (new_owner && *new_owner != '\0')
                return;
 
        _bt_check_hdp_app_termination(name);

diff --git a/bt-service/services/mesh/bt-service-mesh-network.c b/bt-service/services/mesh/bt-service-mesh-network.c
index ba5c7c7489a0e910f5cfb437933c1104cc941191..fe22d2d80ff7ad6812b5286cb0715edab5673548 100644 (file)
--- a/bt-service/services/mesh/bt-service-mesh-network.c
+++ b/bt-service/services/mesh/bt-service-mesh-network.c
@@ -231,6 +231,8 @@ void _bt_check_mesh_app_termination(const char *name)
        const char *app_cred = NULL;
        BT_INFO("Mesh: App terminated [%s]", name);
 
+       ret_if(NULL == name);
+
        /* TODO: Fetch app cred, when support is added */
 
        for (l = cdb_list; l != NULL;) {