broadband-modem-qmi: don't error out on empty call list

Only error out if the required TLVs are missing.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index e61e487a7..ea21a576d 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -9240,15 +9240,20 @@ process_get_all_call_info (QmiClientVoice                       *client,
     guint   i;
     guint   j;
 
-    qmi_message_voice_get_all_call_info_output_get_remote_party_number (output, &qmi_remote_party_number_list, NULL);
-    qmi_message_voice_get_all_call_info_output_get_call_information (output, &qmi_call_information_list, NULL);
-
-    if (!qmi_remote_party_number_list || !qmi_call_information_list) {
+    /* If TLVs missing, report an error */
+    if (!qmi_message_voice_get_all_call_info_output_get_remote_party_number (output, &qmi_remote_party_number_list, NULL) ||
+        !qmi_message_voice_get_all_call_info_output_get_call_information (output, &qmi_call_information_list, NULL)) {
         g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS,
                      "Remote party number or call information not available");
         return FALSE;
     }
 
+    /* If there are no ongoing calls, the lists will be NULL */
+    if (!qmi_remote_party_number_list || !qmi_call_information_list) {
+        *out_call_info_list = NULL;
+        return TRUE;
+    }
+
     for (i = 0; i < qmi_call_information_list->len; i++) {
         QmiMessageVoiceGetAllCallInfoOutputCallInformationCall qmi_call_information;