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

mmcli: don't assume that mm_object_peek_modem or mm_object_get_modem return non null

Browse Source 
This very peculiar case can happen when an intermediate initiliazition step
of a modem fails.

The ModemManager daemon should always expose the modem interface but let not
assume that in mmcli and protect these calls.

Signed-off-by: Frederic Martinsons <frederic.martinsons@sigfox.com>
This commit is contained in:
Frederic Martinsons
2020-12-20 18:11:06 +01:00
committed by Aleksander Morgado
parent 2f53a08e5f
commit 18b72a046e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/mmcli-common.c
View File

@@ -205,7 +205,9 @@ find_modem (MMManager *manager,
MMModem *modem; MMModem *modem;
obj = MM_OBJECT (l->data); obj = MM_OBJECT (l->data);
modem = MM_MODEM (mm_object_get_modem (obj)); modem = mm_object_get_modem (obj);
if (!modem)
continue;
if (modem_any || if (modem_any ||
(modem_path && g_str_equal (mm_object_get_path (obj), modem_path)) || (modem_path && g_str_equal (mm_object_get_path (obj), modem_path)) ||

9
cli/mmcli-manager.c
View File

@@ -332,9 +332,14 @@ output_modem_info (MMObject *obj,
gchar *extra; gchar *extra;
const gchar *manufacturer; const gchar *manufacturer;
const gchar *model; const gchar *model;
MMModem *modem;
manufacturer = mm_modem_get_manufacturer (mm_object_peek_modem (obj)); modem = mm_object_peek_modem (obj);
model = mm_modem_get_model (mm_object_peek_modem (obj)); if (!modem)
return;
manufacturer = mm_modem_get_manufacturer (modem);
model = mm_modem_get_model (modem);
extra = g_strdup_printf ("[%s] %s", extra = g_strdup_printf ("[%s] %s",
manufacturer ? manufacturer : "manufacturer unknown", manufacturer ? manufacturer : "manufacturer unknown",
model ? model : "model unknown"); model ? model : "model unknown");