diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2013-04-24 23:15:43 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-04-25 09:36:51 +0200 |
| commit | 99a8dcce2ca04dccfe7a71bfd78394e710aa1ab1 (patch) | |
| tree | 67280c1a313adc6806dad9d61f56a43fa804cc27 | |
| parent | a32eef3434b169c8e58b285d8f30a3b206fc0dd7 (diff) | |
| download | ModemManager-99a8dcce2ca04dccfe7a71bfd78394e710aa1ab1.tar.gz | |
zte: ensure error is set when +ZSNT response parser doesn't match
| -rw-r--r-- | plugins/zte/mm-broadband-modem-zte.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/plugins/zte/mm-broadband-modem-zte.c b/plugins/zte/mm-broadband-modem-zte.c index 1cdcd9e0a..b87713483 100644 --- a/plugins/zte/mm-broadband-modem-zte.c +++ b/plugins/zte/mm-broadband-modem-zte.c @@ -264,6 +264,7 @@ load_allowed_modes_finish (MMIfaceModem *self, gint cm_mode = -1; gint pref_acq = -1; gboolean result; + GError *match_error = NULL; response = mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, error); if (!response) @@ -273,8 +274,17 @@ load_allowed_modes_finish (MMIfaceModem *self, g_assert (r != NULL); 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; + } if (!mm_get_int_from_match_info (match_info, 1, &cm_mode) || cm_mode < 0 || (cm_mode > 2 && cm_mode != 6) || |