Number and Number Type are optional in CLCC

According to 27.007, the number and number type are optional.  We must
take care not to do anything unexpected in this case.

diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index ef56959..3a2291b 100644 (file)
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -184,13 +184,14 @@ static GSList *parse_clcc(GAtResult *result)
 {
        GAtResultIter iter;
        GSList *l = NULL;
-       int id, dir, status, type, number_type;
+       int id, dir, status, type;
        struct ofono_call *call;
 
        g_at_result_iter_init(&iter, result);
 
        while (g_at_result_iter_next(&iter, "+CLCC:")) {
-               const char *str;
+               const char *str = "";
+               int number_type = 129;
 
                if (!g_at_result_iter_next_number(&iter, &id))
                        continue;
@@ -207,11 +208,8 @@ static GSList *parse_clcc(GAtResult *result)
                if (!g_at_result_iter_skip_next(&iter))
                        continue;
 
-               if (!g_at_result_iter_next_string(&iter, &str))
-                       continue;
-
-               if (!g_at_result_iter_next_number(&iter, &number_type))
-                       continue;
+               if (g_at_result_iter_next_string(&iter, &str))
+                       g_at_result_iter_next_number(&iter, &number_type);
 
                call = g_try_new0(struct ofono_call, 1);