fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 11:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan: return from send_pin_ready() when operation cancelled and fix leak

Browse source 
We call the asynchrnous function mm_sim_send_pin() without taking a
reference on @self. During send_pin_ready() we must first check whether
the request was cancelled because self might be a dangling pointer at
this point.

Also, avoid leaking @error if the ctx is no longer valid.

Fixes: aa0b379699
(cherry picked from commit 37827fcafa)
This commit is contained in:
Thomas Haller 2016-05-10 17:52:13 +02:00
parent 21ca2cf0f6
commit 0b63dbdef7
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/wwan/nm-modem-broadband.c
View file

@ -381,10 +381,13 @@ connect_ready (MMModemSimple *simple_iface,
static void static void
send_pin_ready (MMSim *sim, GAsyncResult *result, NMModemBroadband *self) send_pin_ready (MMSim *sim, GAsyncResult *result, NMModemBroadband *self)
{ {
GError *error = NULL; gs_free_error GError *error = NULL;
mm_sim_send_pin_finish (sim, result, &error); mm_sim_send_pin_finish (sim, result, &error);
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
return;
if (!self->priv->ctx || self->priv->ctx->step != CONNECT_STEP_UNLOCK) if (!self->priv->ctx || self->priv->ctx->step != CONNECT_STEP_UNLOCK)
return; return;
@ -396,7 +399,6 @@ send_pin_ready (MMSim *sim, GAsyncResult *result, NMModemBroadband *self)
} else { } else {
g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error)); g_signal_emit_by_name (self, NM_MODEM_PREPARE_RESULT, FALSE, translate_mm_error (error));
} }
g_error_free (error);
return; return;
} }