[glib: 2/2] Merge branch 'getfsent_lock' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 6d381c9668093ef3f0aeae61c19b4194b49080ea
Merge: 3c47fa6e20 f43cf34151
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jun 27 11:20:49 2022 +0000

    Merge branch 'getfsent_lock' into 'main'
    
    Add lock in _g_get_unix_mount_points() around *fsent() functions
    
    See merge request GNOME/glib!1717

 gio/gunixmounts.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)
---
diff --cc gio/gunixmounts.c
index 155c02c6fb,3005aa7af3..962b964b98
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@@ -1410,9 -1410,9 +1410,10 @@@ _g_get_unix_mount_points (void
  {
    struct fstab *fstab = NULL;
    GUnixMountPoint *mount_point;
-   GList *return_list;
+   GList *return_list = NULL;
+   G_LOCK_DEFINE_STATIC (fsent);
  #ifdef HAVE_SYS_SYSCTL_H
 +  uid_t uid = getuid ();
    int usermnt = 0;
    struct stat sb;
  #endif