From dca9071ffe3c044816c8b0ff692d6aaad0421ab1 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Wed, 28 Feb 2018 11:28:54 -0600
Subject: [PATCH] sim-auth: Improve pending cleanup on sim_auth_remove

---
 src/sim-auth.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/sim-auth.c b/src/sim-auth.c
index e014feef..8cbd01e1 100644
--- a/src/sim-auth.c
+++ b/src/sim-auth.c
@@ -141,7 +141,15 @@ static void sim_auth_unregister(struct ofono_atom *atom)
 	free_apps(sa);
 	g_free(sa->nai);
 
-	g_free(sa->pending);
+	if (sa->pending) {
+		__ofono_dbus_pending_reply(&sa->pending->msg,
+				__ofono_error_sim_not_ready(sa->pending->msg));
+
+		__ofono_sim_remove_session_watch(sa->pending->session,
+							sa->pending->watch_id);
+		g_free(sa->pending);
+		sa->pending = NULL;
+	}
 }
 
 static void sim_auth_remove(struct ofono_atom *atom)