summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Gonzalez <rymg19@gmail.com>2020-08-02 01:05:41 -0500
committerAlexander Larsson <alexander.larsson@gmail.com>2020-08-17 15:52:30 +0200
commitc95cb1973d0cebd31d46e29bd0ebfcca5faa5a1a (patch)
tree329e869204ed36778ab3073b2eb0998a9be35325
parent87a44588d6e0328d13be156ae85f3567732508ac (diff)
downloadflatpak-c95cb1973d0cebd31d46e29bd0ebfcca5faa5a1a.tar.gz
run: Avoid hanging if xdg-dbus-proxy startup fails
-rw-r--r--common/flatpak-run.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/common/flatpak-run.c b/common/flatpak-run.c
index 3aa79cdb..4bd10fc2 100644
--- a/common/flatpak-run.c
+++ b/common/flatpak-run.c
@@ -987,6 +987,10 @@ start_dbus_proxy (FlatpakBwrap *app_bwrap,
NULL, error))
return FALSE;
+ /* The write end can be closed now, otherwise the read below will hang of xdg-dbus-proxy
+ fails to start. */
+ g_clear_pointer (&proxy_bwrap, flatpak_bwrap_free);
+
/* Sync with proxy, i.e. wait until its listening on the sockets */
if (read (sync_fds[0], &x, 1) != 1)
{