diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-generic-cdma.c | 5 | ||||
| -rw-r--r-- | src/mm-generic-gsm.c | 2 | ||||
| -rw-r--r-- | src/mm-modem-base.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index 371cd66e..58ced39b 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -988,7 +988,6 @@ get_signal_quality_done (MMAtSerialPort *port, { MMGenericCdmaPrivate *priv; MMCallbackInfo *info = (MMCallbackInfo *) user_data; - char *reply = response->str; /* If the modem has already been removed, return without * scheduling callback */ @@ -1008,6 +1007,7 @@ get_signal_quality_done (MMAtSerialPort *port, return; } } else { + const char *reply = response->str; int quality, ber; /* Got valid reply */ @@ -1273,7 +1273,7 @@ serving_system_done (MMAtSerialPort *port, gpointer user_data) { MMCallbackInfo *info = (MMCallbackInfo *) user_data; - char *reply = response->str; + char *reply; int class = 0, sid = 99999, num; unsigned char band = 'Z'; gboolean success = FALSE; @@ -1288,6 +1288,7 @@ serving_system_done (MMAtSerialPort *port, goto out; } + reply = response->str; if (strstr (reply, "+CSS: ")) reply += 6; diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c index c41e9f2a..6c7b938c 100644 --- a/src/mm-generic-gsm.c +++ b/src/mm-generic-gsm.c @@ -350,7 +350,7 @@ pin_check_done (MMAtSerialPort *port, info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "Could not parse PIN request response '%s'", - response->str); + response ? response->str : "(unknown)"); } } diff --git a/src/mm-modem-base.c b/src/mm-modem-base.c index 526eb51e..372367a9 100644 --- a/src/mm-modem-base.c +++ b/src/mm-modem-base.c @@ -553,9 +553,10 @@ info_item_done (MMCallbackInfo *info, const char *tag2, const char *desc) { - const char *p = response->str; + const char *p; if (!error) { + p = response->str; if (tag) p = mm_strip_tag (p, tag); if (tag2) |