From 18e3ae8d9a1caed79aec5eab2e8de7aa14b84d0e Mon Sep 17 00:00:00 2001
From: Tom Sydney Kerckhove <syd@cs-syd.eu>
Date: Mon, 22 Mar 2021 05:11:16 +0100
Subject: [PATCH 1/2] Regression test for #38

---
 test/System/Process/TypedSpec.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/System/Process/TypedSpec.hs b/test/System/Process/TypedSpec.hs
index 2fbdc77..1607ca2 100644
--- a/test/System/Process/TypedSpec.hs
+++ b/test/System/Process/TypedSpec.hs
@@ -7,6 +7,7 @@ import System.Process.Typed.Internal
 import System.IO
 import Control.Concurrent.Async (Concurrently (..))
 import Control.Concurrent.STM (atomically)
+import Control.Monad (when, replicateM_)
 import Test.Hspec
 import System.Exit
 import System.IO.Temp
@@ -121,6 +122,22 @@ spec = do
         it "succeeds with sleep"
            ((withProcessWait_ (proc "sleep" ["1"]) $ const $ pure ()) :: IO ())
 
+    -- See https://github.com/fpco/typed-process/issues/38
+    describe "withProcessTerm" $ do
+        let iterations = 200
+        it "does not exhibit a race condition" $ do
+            replicateM_ iterations $ do
+                withProcessTerm (setStdin createPipe $ setStdout createPipe $ setStderr inherit $ proc "cat" []) $ \ph -> do
+                    -- putStrLn $ "Iteration: " <> show i
+                    let inHandle = getStdin ph
+                    let outHandle = getStdout ph
+                    let contents = "Hello world\n"
+                    S.hPut inHandle contents
+                    hFlush inHandle
+                    output <- S.hGet outHandle (S.length contents)
+                    when (output /= contents) $ fail "failed to read."
+
+
     -- These tests fail on older GHCs/process package versions
     -- because, apparently, waitForProcess isn't interruptible. See
     -- https://github.com/fpco/typed-process/pull/26#issuecomment-505702573.

From 967b19f27dc0766b04cd5faf1a20756617c56875 Mon Sep 17 00:00:00 2001
From: Tom Sydney Kerckhove <syd@cs-syd.eu>
Date: Mon, 22 Mar 2021 05:12:48 +0100
Subject: [PATCH 2/2] Fix suggested by snoyberg

---
 src/System/Process/Typed.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/System/Process/Typed.hs b/src/System/Process/Typed.hs
index f70ebcd..8351291 100644
--- a/src/System/Process/Typed.hs
+++ b/src/System/Process/Typed.hs
@@ -768,6 +768,7 @@ startProcess pConfig'@ProcessConfig {..} = liftIO $ do
                       -- then call waitForProcess ourselves
                       Left _ -> do
                           eres <- try $ P.terminateProcess pHandle
+                          P.getProcessExitCode pHandle
                           ec <-
                             case eres of
                               Left e