proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-06-05 06:51:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not leak child processes when cancelling

Browse Source 
See https://github.com/fwupd/fwupd/pull/4372
This commit is contained in:
Richard Hughes 2022-03-14 20:39:35 +00:00
parent b4e88bae49
commit e8f0d76da7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfwupdplugin/fu-common.c
View File

@ -838,10 +838,16 @@ fu_common_spawn_sync(const gchar *const *argv,
fu_common_spawn_create_pollable_source(helper); fu_common_spawn_create_pollable_source(helper);
g_main_loop_run(helper->loop); g_main_loop_run(helper->loop);
g_cancellable_disconnect(cancellable, cancellable_id); g_cancellable_disconnect(cancellable, cancellable_id);
#endif
if (!g_subprocess_wait_check(subprocess, cancellable, error))
return FALSE;
#ifndef _WIN32
if (g_cancellable_set_error_if_cancelled(helper->cancellable, error)) if (g_cancellable_set_error_if_cancelled(helper->cancellable, error))
return FALSE; return FALSE;
#endif #endif
return g_subprocess_wait_check(subprocess, cancellable, error);
/* success */
return TRUE;
} }
/** /**