colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle reading failure replies correctly everywhere.

Browse Source
This commit is contained in:
Tambet Ingo
2008-09-01 16:01:55 +03:00
parent 1bb60347b5
commit c56d5a257b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/mm-modem-huawei.c
View File

@@ -162,7 +162,7 @@ enable (MMModem *modem,
static gboolean static gboolean
parse_syscfg (const char *reply, int *mode_a, int *mode_b, guint32 *band, int *unknown1, int *unknown2) parse_syscfg (const char *reply, int *mode_a, int *mode_b, guint32 *band, int *unknown1, int *unknown2)
{ {
if (strncmp (reply, "^SYSCFG:", 8)) if (reply == NULL || strncmp (reply, "^SYSCFG:", 8))
return FALSE; return FALSE;
if (sscanf (reply + 8, "%d,%d,%x,%d,%d", mode_a, mode_b, band, unknown1, unknown2)) if (sscanf (reply + 8, "%d,%d,%x,%d,%d", mode_a, mode_b, band, unknown1, unknown2))

10
src/mm-generic-gsm.c
View File

@@ -194,7 +194,11 @@ get_string_done (MMSerial *serial, const char *reply, gpointer user_data)
{ {
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
mm_callback_info_set_result (info, g_strdup (reply), g_free); if (reply)
mm_callback_info_set_result (info, g_strdup (reply), g_free);
else
info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "%s", "Reading information failed.");
mm_callback_info_schedule (info); mm_callback_info_schedule (info);
} }
@@ -809,7 +813,7 @@ scan_done (MMSerial *serial, const char *reply, gpointer user_data)
results = g_ptr_array_new (); results = g_ptr_array_new ();
if (!strncmp (reply, "+COPS: ", 7)) { if (reply && !strncmp (reply, "+COPS: ", 7)) {
/* Got valid reply */ /* Got valid reply */
GRegex *r; GRegex *r;
GMatchInfo *match_info; GMatchInfo *match_info;
@@ -927,7 +931,7 @@ get_signal_quality_done (MMSerial *serial, const char *reply, gpointer user_data
MMCallbackInfo *info = (MMCallbackInfo *) user_data; MMCallbackInfo *info = (MMCallbackInfo *) user_data;
guint32 result = 0; guint32 result = 0;
if (!strncmp (reply, "+CSQ: ", 6)) { if (reply && !strncmp (reply, "+CSQ: ", 6)) {
/* Got valid reply */ /* Got valid reply */
int quality; int quality;
int ber; int ber;