From 8f6ec62bfb149ec8dfb6076228dd64e5df27a76b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 11 Oct 2017 17:02:02 -0400 Subject: [PATCH] lib/deploy: Use _exit() for FIFREEZE watchdog This works around an (IMO) SpiderMonkey bug - it tries to clean up in a shared library destructor, but doesn't install a `pthread_atfork()` handler to unset its state. Closes: https://github.com/ostreedev/ostree/issues/1262 Closes: #1264 Approved by: dbnicholson --- src/libostree/ostree-sysroot-deploy.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index c1f5af9e..c34e0097 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -1301,7 +1301,12 @@ fsfreeze_thaw_cycle (OstreeSysroot *self, } if (debug_fifreeze) g_printerr ("fifreeze watchdog was run\n"); - exit (EXIT_SUCCESS); + /* We use _exit() rather than exit() to avoid tripping over any shared + * libraries in process that aren't fork() safe; for example gjs/spidermonkey: + * https://github.com/ostreedev/ostree/issues/1262 + * This doesn't help for the err()/errx() calls above, but eh... + */ + _exit (EXIT_SUCCESS); } else /* Parent process. */ { -- 2.30.2