From 14adbc692a8840dab0f87851fdbfaacef7bb1a36 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 14 Mar 2018 08:19:47 +0100 Subject: [PATCH] ofono: fix crash during complete-connection for Ofono modem nm_modem_complete_connection() cannot just return FALSE in case the modem doesn't overwrite complete_connection(). It must set the error variable. This leads to a crash when calling AddAndActivate for Ofono type modem. It does not affect the ModemManager implementation NMModemBroadband, because that one implements the method. --- src/devices/wwan/nm-modem.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 85f6eb039e..7dcbec1b41 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1094,9 +1094,17 @@ nm_modem_complete_connection (NMModem *self, const GSList *existing_connections, GError **error) { - if (NM_MODEM_GET_CLASS (self)->complete_connection) - return NM_MODEM_GET_CLASS (self)->complete_connection (self, connection, existing_connections, error); - return FALSE; + NMModemClass *klass; + + klass = NM_MODEM_GET_CLASS (self); + if (!klass->complete_connection) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION, + "Modem class %s had no complete_connection method", + G_OBJECT_TYPE_NAME (self)); + return FALSE; + } + + return klass->complete_connection (self, connection, existing_connections, error); } /*****************************************************************************/