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

modem-helpers: don't return any result if an error happens when parsing CPMS=?

Browse Source 
We shouldn't rely on the caller to cleanup intermediate results when returning
an error.
This commit is contained in:
Aleksander Morgado
2014-06-27 09:08:42 +02:00
parent 4406b1e6ec
commit e0f3716d26
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mm-modem-helpers.c
View File

@@ -1188,6 +1188,9 @@ mm_3gpp_parse_cpms_test_response (const gchar *reply,
GRegex *r; GRegex *r;
gchar **split; gchar **split;
guint i; guint i;
GArray *tmp1 = NULL;
GArray *tmp2 = NULL;
GArray *tmp3 = NULL;
g_assert (mem1 != NULL); g_assert (mem1 != NULL);
g_assert (mem2 != NULL); g_assert (mem2 != NULL);
@@ -1228,27 +1231,42 @@ mm_3gpp_parse_cpms_test_response (const gchar *reply,
g_match_info_next (match_info, NULL); g_match_info_next (match_info, NULL);
} }
if (!*mem1) if (!tmp1)
*mem1 = array; tmp1 = array;
else if (!*mem2) else if (!tmp2)
*mem2 = array; tmp2 = array;
else if (!*mem3) else if (!tmp3)
*mem3 = array; tmp3 = array;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
if (*mem3 != NULL) if (tmp3 != NULL)
break; /* once we got the last group, exit... */ break; /* once we got the last group, exit... */
} }
g_strfreev (split); g_strfreev (split);
g_regex_unref (r); g_regex_unref (r);
g_warn_if_fail (*mem1 != NULL); g_warn_if_fail (tmp1 != NULL);
g_warn_if_fail (*mem2 != NULL); g_warn_if_fail (tmp2 != NULL);
g_warn_if_fail (*mem3 != NULL); g_warn_if_fail (tmp3 != NULL);
return (*mem1 && *mem2 && *mem3); /* Only return TRUE if all sets have been parsed correctly */
if (tmp1 && tmp2 && tmp3) {
*mem1 = tmp1;
*mem2 = tmp2;
*mem3 = tmp3;
return TRUE;
}
/* Otherwise, cleanup and return FALSE */
if (tmp1)
g_array_unref (tmp1);
if (tmp2)
g_array_unref (tmp2);
if (tmp3)
g_array_unref (tmp3);
return FALSE;
} }
/*************************************************************************/ /*************************************************************************/

6
src/tests/test-modem-helpers.c
View File

@@ -1825,7 +1825,8 @@ is_storage_supported (GArray *supported,
static void static void
test_cpms_response_cinterion (void *f, gpointer d) test_cpms_response_cinterion (void *f, gpointer d)
{ {
const gchar *reply = "+CPMS: (\"ME\",\"SM\",\"MT\"),(\"ME\",\"SM\",\"MT\"),(\"SM\",\"MT\")"; /* Use different sets for each on purpose, even if weird */
const gchar *reply = "+CPMS: (\"ME\",\"MT\"),(\"ME\",\"SM\",\"MT\"),(\"SM\",\"MT\")";
GArray *mem1 = NULL; GArray *mem1 = NULL;
GArray *mem2 = NULL; GArray *mem2 = NULL;
GArray *mem3 = NULL; GArray *mem3 = NULL;
@@ -1833,9 +1834,8 @@ test_cpms_response_cinterion (void *f, gpointer d)
trace ("\nTesting Cinterion +CPMS=? response...\n"); trace ("\nTesting Cinterion +CPMS=? response...\n");
g_assert (mm_3gpp_parse_cpms_test_response (reply, &mem1, &mem2, &mem3)); g_assert (mm_3gpp_parse_cpms_test_response (reply, &mem1, &mem2, &mem3));
g_assert (mem1->len == 3); g_assert (mem1->len == 2);
g_assert (is_storage_supported (mem1, MM_SMS_STORAGE_ME)); g_assert (is_storage_supported (mem1, MM_SMS_STORAGE_ME));
g_assert (is_storage_supported (mem1, MM_SMS_STORAGE_SM));
g_assert (is_storage_supported (mem1, MM_SMS_STORAGE_MT)); g_assert (is_storage_supported (mem1, MM_SMS_STORAGE_MT));
g_assert (mem2->len == 3); g_assert (mem2->len == 3);
g_assert (is_storage_supported (mem2, MM_SMS_STORAGE_ME)); g_assert (is_storage_supported (mem2, MM_SMS_STORAGE_ME));