From dc38332224f804be1f0557789c95442898827d72 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 29 Jan 2015 12:07:43 +0100 Subject: plugin: avoid segfault when port driver is unknown Based on a patch from Bastiaan Jacques https://bugzilla.redhat.com/show_bug.cgi?id=1177799 https://bugs.freedesktop.org/show_bug.cgi?id=88864 --- src/mm-plugin.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/mm-plugin.c') diff --git a/src/mm-plugin.c b/src/mm-plugin.c index 2b4adeab..a83baea8 100644 --- a/src/mm-plugin.c +++ b/src/mm-plugin.c @@ -708,9 +708,9 @@ mm_plugin_supports_port (MMPlugin *self, } else { /* cdc-wdm ports... */ probe_run_flags = MM_PORT_PROBE_NONE; - if (self->priv->qmi && g_str_equal (mm_device_utils_get_port_driver (port), "qmi_wwan")) + if (self->priv->qmi && !g_strcmp0 (mm_device_utils_get_port_driver (port), "qmi_wwan")) probe_run_flags |= MM_PORT_PROBE_QMI; - else if (self->priv->mbim && g_str_equal (mm_device_utils_get_port_driver (port), "cdc_mbim")) + else if (self->priv->mbim && !g_strcmp0 (mm_device_utils_get_port_driver (port), "cdc_mbim")) probe_run_flags |= MM_PORT_PROBE_MBIM; else probe_run_flags |= MM_PORT_PROBE_AT; @@ -880,8 +880,7 @@ mm_plugin_create_modem (MMPlugin *self, } #if !defined WITH_QMI else if (mm_port_probe_get_port_type (probe) == MM_PORT_TYPE_NET && - g_str_equal (mm_device_utils_get_port_driver (mm_port_probe_peek_port (probe)), - "qmi_wwan")) { + !g_strcmp0 (mm_device_utils_get_port_driver (mm_port_probe_peek_port (probe)), "qmi_wwan")) { /* Try to generically grab the port, but flagged as ignored */ grabbed = mm_base_modem_grab_port (modem, mm_port_probe_get_port_subsys (probe), @@ -894,8 +893,7 @@ mm_plugin_create_modem (MMPlugin *self, #endif #if !defined WITH_MBIM else if (mm_port_probe_get_port_type (probe) == MM_PORT_TYPE_NET && - g_str_equal (mm_device_utils_get_port_driver (mm_port_probe_peek_port (probe)), - "cdc_mbim")) { + !g_strcmp0 (mm_device_utils_get_port_driver (mm_port_probe_peek_port (probe)), "cdc_mbim")) { /* Try to generically grab the port, but flagged as ignored */ grabbed = mm_base_modem_grab_port (modem, mm_port_probe_get_port_subsys (probe), -- cgit v1.2.3-70-g09d2