From d9bb71e521de61bc8c2900ddd82e2bfcdd9cf97d Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 13 Jan 2010 11:40:15 -0600 Subject: Fix: Don't try to unregister a null mcc/mnc Network operators with null MCC & MNC are not registered, but we try to unregister them. Don't do this as it causes a crash. --- src/network.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/network.c b/src/network.c index 69959c5e..8b4eb09e 100644 --- a/src/network.c +++ b/src/network.c @@ -1607,8 +1607,14 @@ static void netreg_unregister(struct ofono_atom *atom) __ofono_watchlist_free(netreg->status_watches); netreg->status_watches = NULL; - for (l = netreg->operator_list; l; l = l->next) + for (l = netreg->operator_list; l; l = l->next) { + struct network_operator_data *opd = l->data; + + if (opd->mcc[0] == '\0' && opd->mnc[0] == '\0') + continue; + network_operator_dbus_unregister(netreg, l->data); + } g_slist_free(netreg->operator_list); netreg->operator_list = NULL; -- cgit v1.2.3