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

Return an error ig scan results can not be parsed (fixes a segfault).

Browse Source
This commit is contained in:
Tambet Ingo
2008-10-20 11:54:02 +03:00
parent 94501f0854
commit cdccfa8ac1
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -765,26 +765,26 @@ scan_done (MMSerial *serial,
else if (!strncmp (reply, "+COPS: ", 7)) { else if (!strncmp (reply, "+COPS: ", 7)) {
/* Got valid reply */ /* Got valid reply */
GPtrArray *results; GPtrArray *results;
GRegex *r; GRegex *r;
GMatchInfo *match_info; GMatchInfo *match_info;
GError *err = NULL; GError *err = NULL;
reply += 7; reply += 7;
/* Pattern without crazy escaping using | for matching: (|\d|,"|.+|","|.+|","|.+|",|\d|) */ /* Pattern without crazy escaping using | for matching: (|\d|,"|.+|","|.+|","|.+|",|\d|) */
r = g_regex_new ("\\((\\d),\"(.+)\",\"(.+)\",\"(.+)\",(\\d)\\)", G_REGEX_UNGREEDY, 0, &err); r = g_regex_new ("\\((\\d),\"(.+)\",\"(.+)\",\"(.+)\",(\\d)\\)", G_REGEX_UNGREEDY, 0, &err);
if (err) { if (err) {
g_error ("Invalid regular expression: %s", err->message); g_error ("Invalid regular expression: %s", err->message);
g_error_free (err); g_error_free (err);
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse scan results."); "Could not parse scan results.");
goto out; goto out;
} }
results = g_ptr_array_new (); results = g_ptr_array_new ();
g_regex_match (r, reply, 0, &match_info); g_regex_match (r, reply, 0, &match_info);
while (g_match_info_matches (match_info)) { while (g_match_info_matches (match_info)) {
GHashTable *hash; GHashTable *hash;
hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
@@ -794,13 +794,15 @@ scan_done (MMSerial *serial,
g_hash_table_insert (hash, g_strdup ("operator-num"), g_match_info_fetch (match_info, 4)); g_hash_table_insert (hash, g_strdup ("operator-num"), g_match_info_fetch (match_info, 4));
g_ptr_array_add (results, hash); g_ptr_array_add (results, hash);
g_match_info_next (match_info, NULL); g_match_info_next (match_info, NULL);
} }
mm_callback_info_set_data (info, "scan-results", results, destroy_scan_data); mm_callback_info_set_data (info, "scan-results", results, destroy_scan_data);
g_match_info_free (match_info); g_match_info_free (match_info);
g_regex_unref (r); g_regex_unref (r);
} } else
info->error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL,
"Could not parse scan results.");
out: out:
mm_callback_info_schedule (info); mm_callback_info_schedule (info);