diff options
| author | Andrzej Zaborowski <andrew.zaborowski@intel.com> | 2009-07-18 01:44:54 +0200 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-07-17 23:48:29 -0500 |
| commit | a5bcab75649409fc91a3e9835a8f91382d845431 (patch) | |
| tree | 8b9c6f6bc8b67513a0cbdbcc2ea8fb6f1bf5bfc2 /src | |
| parent | da0bdb1cbf7b0817899a3d9a86ad289230b466b6 (diff) | |
| download | ofono-a5bcab75649409fc91a3e9835a8f91382d845431.tar.bz2 | |
Don't dereference before the null check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/network.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network.c b/src/network.c index 1233c84a..d3806083 100644 --- a/src/network.c +++ b/src/network.c @@ -339,7 +339,7 @@ static char *get_operator_display_name(struct ofono_modem *modem) { struct network_registration_data *netreg = modem->network_registration; struct network_operator_data *current = netreg->current_operator; - struct ofono_network_operator *op = current->info; + struct ofono_network_operator *op; const char *plmn; static char name[1024]; int len = sizeof(name); @@ -349,11 +349,13 @@ static char *get_operator_display_name(struct ofono_modem *modem) * PLMN or roaming and on configuration bits from the SIM, all * together there are four cases to consider. */ - if (!netreg->current_operator) { + if (!current) { g_strlcpy(name, "", len); return name; } + op = current->info; + plmn = op->name; if (current->eons_info && current->eons_info->longname) plmn = current->eons_info->longname; |