iface-modem: free GError when interface initialization is cancelled

This patch fixes an assertion failure 'ctx->fatal_error == NULL' in
initialization_context_complete_and_free(), which happens if
'fatal_error' of the initialization context is set during the modem
interface initialization and the initialization is later cancelled.
This commit is contained in:
Ben Chan
2013-09-16 07:51:53 +02:00
committed by Aleksander Morgado
parent 8a857b7b26
commit 5d8efff291
+6
View File
@@ -3530,6 +3530,12 @@ initialization_context_complete_and_free_if_cancelled (InitializationContext *ct
if (!g_cancellable_is_cancelled (ctx->cancellable))
return FALSE;
/* Simply ignore any fatal error encountered as the initialization is cancelled anyway. */
if (ctx->fatal_error) {
g_error_free (ctx->fatal_error);
ctx->fatal_error = NULL;
}
g_simple_async_result_set_error (ctx->result,
MM_CORE_ERROR,
MM_CORE_ERROR_CANCELLED,