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

port-serial: un-schedule flash operation as soon as it's cancelled

Browse Source 
When a flash operation is started, it is always scheduled in an idle.
If this operation is cancelled, we should right away un-schedule it,
otherwise we may end up calling flash_do() with the GTask in the
private info already gone.

See https://gitlab.freedesktop.org/mobile-broadband/ModemManager/merge_requests/178#note_330017
This commit is contained in:
Aleksander Morgado
2019-12-31 15:40:13 +01:00
parent 7a398214f9
commit 21e5b1d683
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mm-port-serial.c
View File

@@ -1744,18 +1744,28 @@ flash_cancel_cb (GTask *task)
void
mm_port_serial_flash_cancel (MMPortSerial *self)
{
FlashContext *ctx;
GTask *task;
/* Do nothing if there is no flash task */
if (!self->priv->flash_task)
return;
/* Recover task and schedule it to be cancelled in an idle.
/* Recover task */
task = self->priv->flash_task;
self->priv->flash_task = NULL;
/* If flash operation is scheduled, unschedule it */
ctx = g_task_get_task_data (task);
if (ctx->flash_id) {
g_source_remove (ctx->flash_id);
ctx->flash_id = 0;
}
/* Schedule task to be cancelled in an idle.
* We do NOT want this cancellation to happen right away,
* because the object reference in the flashing task may
* be the last one valid. */
task = self->priv->flash_task;
self->priv->flash_task = NULL;
g_idle_add ((GSourceFunc)flash_cancel_cb, task);
}