luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 03:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/chergert/fix-2708' into 'main'

Browse Source 
gmain: close pidfd when finalizing GChildWatchSource

Closes #2708

See merge request GNOME/glib!2847
This commit is contained in:
Emmanuele Bassi 2022-08-02 19:53:44 +00:00
commit ab189ecfed
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gmain.c
View File

@ -5804,7 +5804,11 @@ g_child_watch_finalize (GSource *source)
GChildWatchSource *child_watch_source = (GChildWatchSource *) source; GChildWatchSource *child_watch_source = (GChildWatchSource *) source;
if (child_watch_source->using_pidfd) if (child_watch_source->using_pidfd)
return; {
if (child_watch_source->poll.fd >= 0)
close (child_watch_source->poll.fd);
return;
}
G_LOCK (unix_signal_lock); G_LOCK (unix_signal_lock);
unix_child_watches = g_slist_remove (unix_child_watches, source); unix_child_watches = g_slist_remove (unix_child_watches, source);