Fix memory leak in handleToFd, fixes issue #4

haskell · Jul 10, 2022 · 176ca32 · 176ca32
1 parent e919c7d
commit 176ca32
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/System/Posix.hs b/System/Posix.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix

diff --git a/System/Posix/ByteString.hs b/System/Posix/ByteString.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE CPP #-}
-{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix.ByteString

diff --git a/System/Posix/IO.hsc b/System/Posix/IO.hsc
@@ -1,4 +1,3 @@
-{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix.IO

diff --git a/System/Posix/IO/ByteString.hsc b/System/Posix/IO/ByteString.hsc
@@ -1,4 +1,3 @@
-{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix.IO.ByteString

diff --git a/System/Posix/IO/Common.hsc b/System/Posix/IO/Common.hsc
@@ -1,7 +1,6 @@
 {-# LANGUAGE CApiFFI #-}
 {-# LANGUAGE NondecreasingIndentation #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE Safe #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -73,7 +72,10 @@ import GHC.IO.Handle.Types
 import qualified GHC.IO.FD as FD
 import qualified GHC.IO.Handle.FD as FD
 import GHC.IO.Exception
+import GHC.IO.Buffer
+import GHC.IORef
 import Data.Typeable (cast)
+import System.IO.Unsafe (unsafePerformIO)
 
 #if !defined(HAVE_PIPE)
 import System.IO.Error ( ioeSetLocation )
@@ -301,10 +303,26 @@ handleToFd' h h_@Handle__{haType=_,..} = do
      -- converting a Handle into an Fd effectively means
      -- letting go of the Handle; it is put into a closed
      -- state as a result.
-     flushWriteBuffer h_
+
+     -- free the spare buffers
+     writeIORef haBuffers BufferListNil
+     writeIORef haCharBuffer noCharBuffer
+     writeIORef haByteBuffer noByteBuffer
+
+     -- release our encoder/decoder
+     closeTextCodecs h_
+
      FD.release fd
      return (Handle__{haType=ClosedHandle,..}, Fd (FD.fdFD fd))
 
+{-# NOINLINE noCharBuffer #-}
+noCharBuffer :: CharBuffer
+noCharBuffer = unsafePerformIO $ newCharBuffer 1 ReadBuffer
+
+{-# NOINLINE noByteBuffer #-}
+noByteBuffer :: Buffer Word8
+noByteBuffer = unsafePerformIO $ newByteBuffer 1 ReadBuffer
+
 
 -- -----------------------------------------------------------------------------
 -- Fd options

diff --git a/System/Posix/Temp.hsc b/System/Posix/Temp.hsc
@@ -1,5 +1,4 @@
 {-# LANGUAGE CApiFFI #-}
-{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix.Temp

diff --git a/System/Posix/Temp/ByteString.hsc b/System/Posix/Temp/ByteString.hsc
@@ -1,5 +1,4 @@
 {-# LANGUAGE CApiFFI #-}
-{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Posix.Temp.ByteString