1 files changed, 7 insertions, 0 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 13f6d117ebc..c5b32c7c0e7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1257,6 +1257,13 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
     tzset ();
 #endif /* MSDOS */
 
+  /* Do this after initializing the memory allocator, since it uses
+     glib and glib uses malloc.  And do it before anything else that
+     invokes glib, to avoid potential races among glib subthreads in
+     Cygwin glib.  gfilenotify invokes glib, so this can't be delayed
+     further.  */
+  catch_child_signal ();
+
 #ifdef HAVE_GFILENOTIFY
   globals_of_gfilenotify ();
 #endif