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

device: add null check on `self->priv->modem' in clear_modem

Browse Source 
clear_modem() can be invoked from set_property() and dispose(), where
`self->priv->modem' may be NULL. This patch adds a null check on the
modem object to make sure we don't run g_object_run_dispose() on a null
modem object.
This commit is contained in:
Ben Chan
2017-03-03 10:29:50 -08:00
committed by Aleksander Morgado
parent f0cda20930
commit 73bfe94643
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mm-device.c
View File

@@ -302,10 +302,12 @@ clear_modem (MMDevice *self)
self->priv->modem_valid_id = 0; self->priv->modem_valid_id = 0;
} }
/* Run dispose before unref-ing, in order to cleanup the SIM object, if (self->priv->modem) {
* if any (which also holds a reference to the modem object) */ /* Run dispose before unref-ing, in order to cleanup the SIM object,
g_object_run_dispose (G_OBJECT (self->priv->modem)); * if any (which also holds a reference to the modem object) */
g_clear_object (&(self->priv->modem)); g_object_run_dispose (G_OBJECT (self->priv->modem));
g_clear_object (&(self->priv->modem));
}
} }
void void