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

novatel: ensure error is set when $NWRAT response parser doesn't match

Browse Source
This commit is contained in:
Aleksander Morgado
2013-04-24 23:08:09 +02:00
parent 2e6ba7cd09
commit 52fd67e365
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/novatel/mm-broadband-modem-novatel.c
View File

@@ -86,7 +86,7 @@ nwrat_query_ready (MMBaseModem *self,
GError *error = NULL; GError *error = NULL;
const gchar *response; const gchar *response;
GRegex *r; GRegex *r;
GMatchInfo *match_info; GMatchInfo *match_info = NULL;
gint a = -1; gint a = -1;
gint b = -1; gint b = -1;
@@ -103,13 +103,17 @@ nwrat_query_ready (MMBaseModem *self,
g_assert (r != NULL); g_assert (r != NULL);
if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &error)) { if (!g_regex_match_full (r, response, strlen (response), 0, 0, &match_info, &error)) {
g_prefix_error (&error, if (error)
"Failed to parse mode/tech response '%s': ", g_simple_async_result_take_error (simple, error);
response); else
g_regex_unref (r); g_simple_async_result_set_error (simple,
g_simple_async_result_take_error (simple, error); MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Couldn't match NWRAT reply: %s",
response);
g_simple_async_result_complete (simple); g_simple_async_result_complete (simple);
g_object_unref (simple); g_object_unref (simple);
g_regex_unref (r);
return; return;
} }