Use Process.withCreateProcess to ensure child cleanup

Mikolaj · Mar 18, 2022 · 0284bfb · 0284bfb
1 parent 67092da
commit 0284bfb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Cabal/src/Distribution/Simple/Utils.hs b/Cabal/src/Distribution/Simple/Utils.hs
@@ -789,9 +789,10 @@ rawSystemProcAction :: Verbosity -> Process.CreateProcess
                     -> IO (ExitCode, a)
 rawSystemProcAction verbosity cp action = withFrozenCallStack $ do
   logCommand verbosity cp
-  (mStdin, mStdout, mStderr, p) <- Process.createProcess cp
-  a <- action mStdin mStdout mStderr
-  exitcode <- Process.waitForProcess p
+  (exitcode, a) <- Process.withCreateProcess cp $ \mStdin mStdout mStderr p -> do
+    a <- action mStdin mStdout mStderr
+    exitcode <- Process.waitForProcess p
+    return (exitcode, a)
   unless (exitcode == ExitSuccess) $ do
     let cmd = case Process.cmdspec cp of
           Process.ShellCommand sh -> sh