summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2018-09-13 09:26:19 +0200
committerAleksander Morgado <aleksander@aleksander.es>2018-09-13 09:26:19 +0200
commit823aa46a148725e9e1bf4f38517230f384dc0f9a (patch)
tree7af36284ca8ae6e76001a52daba92df6890c8500
parent6b30f552a91ec0478f6a06fdc4e3d6740064bc0a (diff)
downloadModemManager-823aa46a148725e9e1bf4f38517230f384dc0f9a.tar.gz
xmm: ensure outputs in load_values_finish() are always set if success
-rw-r--r--plugins/xmm/mm-modem-helpers-xmm.c6
-rw-r--r--plugins/xmm/mm-shared-xmm.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/plugins/xmm/mm-modem-helpers-xmm.c b/plugins/xmm/mm-modem-helpers-xmm.c
index 6b2e98d36..083c1adf5 100644
--- a/plugins/xmm/mm-modem-helpers-xmm.c
+++ b/plugins/xmm/mm-modem-helpers-xmm.c
@@ -799,11 +799,11 @@ mm_xmm_xcesq_response_to_signal_info (const gchar *response,
return FALSE;
}
- if (gsm)
+ if (out_gsm)
*out_gsm = gsm;
- if (umts)
+ if (out_umts)
*out_umts = umts;
- if (lte)
+ if (out_lte)
*out_lte = lte;
return TRUE;
diff --git a/plugins/xmm/mm-shared-xmm.c b/plugins/xmm/mm-shared-xmm.c
index 6181a4447..3aa85c2df 100644
--- a/plugins/xmm/mm-shared-xmm.c
+++ b/plugins/xmm/mm-shared-xmm.c
@@ -734,6 +734,11 @@ mm_shared_xmm_signal_load_values_finish (MMIfaceModemSignal *self,
if (!response || !mm_xmm_xcesq_response_to_signal_info (response, gsm, umts, lte, error))
return FALSE;
+ if (cdma)
+ *cdma = NULL;
+ if (evdo)
+ *evdo = NULL;
+
return TRUE;
}