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

shared-qmi: don't assume cancellation signal handler is setup in the registration wait

Browse Source 
The cancellation_id will not be set if the cancellable is already
cancelled by the time g_cancellable_connect() is called.
This commit is contained in:
Aleksander Morgado
2023-05-03 14:25:51 +00:00
parent 28eec45dbb
commit f3cdafb746
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mm-shared-qmi.c
View File

@@ -210,7 +210,7 @@ register_in_network_cancelled (GCancellable *cancellable,
ctx = g_task_get_task_data (task); ctx = g_task_get_task_data (task);
g_assert (ctx->cancellable); g_assert (ctx->cancellable);
g_assert (ctx->cancellable_id); if (ctx->cancellable_id)
ctx->cancellable_id = 0; ctx->cancellable_id = 0;
g_assert (ctx->timeout_id); g_assert (ctx->timeout_id);
@@ -241,9 +241,10 @@ register_in_network_timeout (GTask *task)
g_signal_handler_disconnect (ctx->client, ctx->serving_system_indication_id); g_signal_handler_disconnect (ctx->client, ctx->serving_system_indication_id);
ctx->serving_system_indication_id = 0; ctx->serving_system_indication_id = 0;
g_assert (!ctx->cancellable || ctx->cancellable_id); if (ctx->cancellable && ctx->cancellable_id) {
g_cancellable_disconnect (ctx->cancellable, ctx->cancellable_id); g_cancellable_disconnect (ctx->cancellable, ctx->cancellable_id);
ctx->cancellable_id = 0; ctx->cancellable_id = 0;
}
/* the 3GPP interface will take care of checking if the registration is /* the 3GPP interface will take care of checking if the registration is
* the one we asked for */ * the one we asked for */
@@ -283,9 +284,10 @@ register_in_network_ready (GTask *task,
g_source_remove (ctx->timeout_id); g_source_remove (ctx->timeout_id);
ctx->timeout_id = 0; ctx->timeout_id = 0;
g_assert (!ctx->cancellable || ctx->cancellable_id); if (ctx->cancellable && ctx->cancellable_id) {
g_cancellable_disconnect (ctx->cancellable, ctx->cancellable_id); g_cancellable_disconnect (ctx->cancellable, ctx->cancellable_id);
ctx->cancellable_id = 0; ctx->cancellable_id = 0;
}
/* the 3GPP interface will take care of checking if the registration is /* the 3GPP interface will take care of checking if the registration is
* the one we asked for */ * the one we asked for */