From c3f8daaf7d6ef3a88dd23c6c389f4ee910975f58 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Mon, 13 Sep 2021 13:15:50 -0700
Subject: [PATCH] Bug 798250 - Gnucash permanent hang on save while loading
 report

Prevent WebKit's fork from getting a copy of the pipe's file descriptors
and so keeping the pipe from closing.

Thanks to Simon Arlott for recognizing the FD duplication.
---
 CMakeLists.txt                          |  2 +-
 libgnucash/backend/xml/io-gncxml-v2.cpp | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad007c262d..2613a43e65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
 endif()
 
 project (gnucash
-    VERSION 4.6
+    VERSION 4.7
 )
 
 enable_testing()
diff --git a/libgnucash/backend/xml/io-gncxml-v2.cpp b/libgnucash/backend/xml/io-gncxml-v2.cpp
index d5b438be7d..955a490022 100644
--- a/libgnucash/backend/xml/io-gncxml-v2.cpp
+++ b/libgnucash/backend/xml/io-gncxml-v2.cpp
@@ -1451,6 +1451,7 @@ gz_thread_func (gz_thread_params_t* params)
             }
             else if (bytes == 0)
             {
+                printf("gz_thread_func EOF\n");
                 break;
             }
             else
@@ -1523,7 +1524,7 @@ try_gz_open (const char* filename, const char* perms, gboolean use_gzip,
         return g_fopen (filename, perms);
 
     {
-        int filedes[2];
+        int filedes[2]{};
         GThread* thread;
         gz_thread_params_t* params;
         FILE* file;
@@ -1532,10 +1533,23 @@ try_gz_open (const char* filename, const char* perms, gboolean use_gzip,
         if (_pipe (filedes, 4096, _O_BINARY) < 0)
         {
 #else
-        if (pipe (filedes) < 0)
+        /* Set CLOEXEC on the pipe FDs so that if the user runs a
+         * report while saving WebKit's fork won't get an open copy
+         * and keep the pipe from closing. See
+         * https://bugs.gnucash.org/show_bug.cgi?id=798250. Win32
+         * doesn't fork nor does it support CLOEXEC.
+         */
+        if (pipe (filedes) < 0 ||
+            fcntl(filedes[0], F_SETFD, FD_CLOEXEC) == -1 ||
+	    fcntl(filedes[1], F_SETFD, FD_CLOEXEC) == -1)
         {
 #endif
-            g_warning ("Pipe call failed. Opening uncompressed file.");
+            g_warning ("Pipe setup failed with errno %d. Opening uncompressed file.", errno);
+            if (filedes[0])
+            {
+                close(filedes[0]);
+                close(filedes[1]);
+            }
             return g_fopen (filename, perms);
         }