From a3edb44adaa51c785baa675cba14a522da526d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20H=C3=B6rberg?= <carl@84codes.com>
Date: Fri, 8 Sep 2023 12:39:37 +0200
Subject: [PATCH] Simplify File#finalize

Memory should never be allocated in a finalize method so can't have the
risk of raising something there
---
 src/lavinmq/mfile.cr | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/lavinmq/mfile.cr b/src/lavinmq/mfile.cr
index 1e4bf0b6dc..9356c57712 100644
--- a/src/lavinmq/mfile.cr
+++ b/src/lavinmq/mfile.cr
@@ -109,7 +109,7 @@ class MFile < IO
     return if @closed
     @closed = true
     begin
-      munmap
+      unmap
 
       return if @readonly || @deleted || !truncate_to_size
       code = LibC.ftruncate(@fd, @size)
@@ -117,6 +117,7 @@ class MFile < IO
     ensure
       code = LibC.close(@fd)
       raise File::Error.from_errno("Error closing file", file: @path) if code < 0
+      @fd = -1
     end
   end
 
@@ -147,7 +148,7 @@ class MFile < IO
   # Won't mmap the file if it's unmapped already
   def copy_to(output : IO, size = @size) : Int64
     if unmapped? # don't remap unmapped files
-      io = IO::FileDescriptor.new(@fd, blocking: false, close_on_finalize: false)
+      io = IO::FileDescriptor.new(@fd, blocking: true, close_on_finalize: false)
       io.rewind
       IO.copy(io, output, size) == size || raise IO::EOFError.new
     else
@@ -186,7 +187,8 @@ class MFile < IO
   end
 
   def finalize
-    close(truncate_to_size: false)
+    LibC.close(@fd) if @fd > -1
+    LibC.munmap(@buffer, @capacity) unless @buffer.null?
   end
 
   def write(slice : Bytes) : Nil