Re: crash when unplugged modem when it was still initializing

[Denis Kenzior <denkenz@gmail.com>]

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

On 01/24/2012 03:33 PM, Jussi Kukkonen wrote:
> On Tue, Jan 24, 2012 at 11:19 PM, Jussi Kukkonen
> <jussi.kukkonen@intel.com> wrote:
>> Hi,
>> I happened to unplug my dongle quite soon after starting ofono. It
>> promptly aborted.
> 
> and it just happened again with no relation to unplugging devices or
> starting ofonod s othose were red herrings. In fact I hadn't touched
> anything for a moment: connmand and ofonod were both running.
> 

Try the following patch.

Regards,
-Denis

[-- Attachment #2: 0001-sim-Fix-crash-due-to-uninitialized-spn_watch.patch --]
[-- Type: text/plain, Size: 852 bytes --]

>From 43cb98b7134cff765e10db2c94402695f795b8ff Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Tue, 24 Jan 2012 11:33:16 -0600
Subject: [PATCH] sim: Fix crash due to uninitialized spn_watch

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

diff --git a/src/sim.c b/src/sim.c
index 703e0db..eb25e07 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2530,6 +2530,14 @@ static void sim_spn_close(struct ofono_sim *sim)
 	__ofono_watchlist_free(sim->spn_watches);
 	sim->spn_watches = NULL;
 
+	/*
+	 * We have not initialized SPN logic at all yet, either because
+	 * no netreg / gprs atom has been needed or we have not reached the
+	 * post_sim state
+	 */
+	if (sim->ef_spn_watch == 0)
+		return;
+
 	ofono_sim_remove_file_watch(sim->context, sim->ef_spn_watch);
 	sim->ef_spn_watch = 0;
 
-- 
1.7.3.4