Cancel bonding if requestor exits

1 files changed, 1 insertions, 5 deletions

diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index f7b409e6..c4ef5931 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -562,11 +562,8 @@ void cancel_passkey_agent_requests(struct slist *agents, const char *path, bdadd
 {
 	struct slist *l, *next;
 
-	if (!default_agent)
-		return;
-
 	/* First check the default agent */
-	for (l = default_agent->pending_requests; l != NULL; l = next) {
+	for (l = default_agent ? default_agent->pending_requests : NULL; l != NULL; l = next) {
 		struct pending_agent_request *req = l->data;
 		next = l->next;
 		if (!strcmp(path, req->path) && (!addr || !bacmp(addr, &req->bda))) {
@@ -588,5 +585,4 @@ void cancel_passkey_agent_requests(struct slist *agents, const char *path, bdadd
 			}
 		}
 	}
-
 }