[PATCH_v2 1/2] emulator: Test already done in g_at_server_resume()

[PATCH_v2 1/2] emulator: Test already done in g_at_server_resume()

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

---
 src/emulator.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index e7c7d41..c3165eb 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -100,9 +100,6 @@ static void cleanup_ppp(struct ofono_emulator *em)
 	__ofono_private_network_release(em->pns_id);
 	em->pns_id = 0;
 
-	if (em->server == NULL)
-		return;
-
 	g_at_server_resume(em->server);
 	g_at_server_send_final(em->server, G_AT_SERVER_RESULT_NO_CARRIER);
 }
-- 
1.7.5.4

[PATCH_v2 2/2] gatserver: Add NULL check to avoid crash

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 694 bytes --]

Dundee is not waiting to receive the NO CARRIER notification
to close the IO channel with oFono so that oFono is trying to
send a NO CARRIER although GAtServer is removed.
---
 gatchat/gatserver.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gatchat/gatserver.c b/gatchat/gatserver.c
index 7c87c7a..e3cbb8f 100644
--- a/gatchat/gatserver.c
+++ b/gatchat/gatserver.c
@@ -222,6 +222,9 @@ static inline void send_final_numeric(GAtServer *server, GAtServerResult result)
 
 void g_at_server_send_final(GAtServer *server, GAtServerResult result)
 {
+	if (server == NULL)
+		return;
+
 	if (server->final_sent != FALSE)
 		return;
 
-- 
1.7.5.4