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

zte: ensure error is set when +ZSNT response parser doesn't match

Browse Source
This commit is contained in:
Aleksander Morgado
2013-04-24 23:15:43 +02:00
parent a32eef3434
commit 99a8dcce2c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/zte/mm-broadband-modem-zte.c
View File

@@ -264,6 +264,7 @@ load_allowed_modes_finish (MMIfaceModem *self,
gint cm_mode = -1; gint cm_mode = -1;
gint pref_acq = -1; gint pref_acq = -1;
gboolean result; gboolean result;
GError *match_error = NULL;
response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error); response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error);
if (!response) if (!response)
@@ -273,8 +274,17 @@ load_allowed_modes_finish (MMIfaceModem *self,
g_assert (r != NULL); g_assert (r != NULL);
result = FALSE; result = FALSE;
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, &match_error)) {
if (match_error)
g_propagate_error (error, match_error);
else
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_FAILED,
"Couldn't parse +ZSNT response: '%s'",
response);
goto done; goto done;
}
if (!mm_get_int_from_match_info (match_info, 1, &cm_mode) || if (!mm_get_int_from_match_info (match_info, 1, &cm_mode) ||
cm_mode < 0 || (cm_mode > 2 && cm_mode != 6) || cm_mode < 0 || (cm_mode > 2 && cm_mode != 6) ||