From 839330cd39df8bb1c54cb35ce81f7c381b9090d1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 19 Oct 2015 15:16:20 +0200 Subject: [PATCH] device: properly cancel queued activation request We would leak the NMActivationRequest when carrier didn't come within timeout. We must properly set the state of the activation request. https://bugzilla.redhat.com/show_bug.cgi?id=1079353 Fixes: 0bfe635119facb8514e8f5824f599f4c4c3514e2 --- src/devices/nm-device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 7c77c9ca80..7338ff5ffb 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -6622,7 +6622,7 @@ _carrier_wait_check_queued_act_request (NMDevice *self) priv->queued_act_request_is_waiting_for_carrier = FALSE; if (!priv->carrier) { _LOGD (LOGD_DEVICE, "Cancel queued activation request as we have no carrier after timeout"); - g_clear_object (&priv->queued_act_request); + _clear_queued_act_request (priv); } else { _LOGD (LOGD_DEVICE, "Activate queued activation request as we now have carrier"); queued_req = priv->queued_act_request;