Fixed: A case of leaked handle in RegisterBf and RegisterSpd

Sewer56 · Jan 12, 2024 · c5c9c0a · c5c9c0a
1 parent a2e7b8e
commit c5c9c0a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/Emulator/BF.File.Emulator/BfEmulator.cs b/Emulator/BF.File.Emulator/BfEmulator.cs
@@ -141,7 +141,11 @@ public void OnModLoading(string modFolder)
     /// Invalidates a BF file with a specified name.
     /// </summary>
     /// <param name="bfPath">Full path to the file.</param>
-    public void UnregisterFile(string bfPath) => _pathToStream!.Remove(bfPath, out _);
+    public void UnregisterFile(string bfPath)
+    {
+        _pathToStream!.Remove(bfPath, out var stream);
+        stream?.Dispose();
+    }
 
     public void RegisterFile(string destinationPath, Stream stream)
     {

diff --git a/Emulator/BF.File.Emulator/BfEmulatorApi.cs b/Emulator/BF.File.Emulator/BfEmulatorApi.cs
@@ -56,13 +56,9 @@ public void RegisterBf(string sourcePath, string destinationPath)
         }
 
         Native.SetFilePointerEx(handle, 0, IntPtr.Zero, 0);
-
-        var fileStream = new FileStream(new SafeFileHandle(handle, false), FileAccess.Read);
-        var stream = StreamUtils.CreateMemoryStream(fileStream.Length);
-        fileStream.CopyTo(stream);
-
-        var emulated = new EmulatedFile<Stream>(stream);
-        _bfEmulator.RegisterFile(destinationPath, stream);
+        var fileStream = new FileStream(new SafeFileHandle(handle, true), FileAccess.Read);
+        var emulated = new EmulatedFile<FileStream>(fileStream);
+        _bfEmulator.RegisterFile(destinationPath, fileStream);
         _framework.RegisterVirtualFile(destinationPath, emulated, false);
 
         _logger.Info("[BfEmulatorApi] Registered bf {0} at {1}", sourcePath, destinationPath);

diff --git a/Emulator/SPD.File.Emulator/SpdEmulator.cs b/Emulator/SPD.File.Emulator/SpdEmulator.cs
@@ -115,7 +115,11 @@ private void DumpFile(string filepath, MultiStream stream)
     /// Invalidates a SPD file with a specified name.
     /// </summary>
     /// <param name="spdPath">Full path to the file.</param>
-    public void UnregisterFile(string spdPath) => _pathToStream.Remove(spdPath, out _);
+    public void UnregisterFile(string spdPath)
+    { 
+        _pathToStream.Remove(spdPath, out var stream);
+        stream?.Dispose();
+    }
 
     public void RegisterFile(string destinationPath, Stream stream)
     {

diff --git a/Emulator/SPD.File.Emulator/SpdEmulatorApi.cs b/Emulator/SPD.File.Emulator/SpdEmulatorApi.cs
@@ -95,11 +95,11 @@ public void RegisterSpd(string sourcePath, string destinationPath)
 
         _ = Native.SetFilePointerEx(handle, 0, IntPtr.Zero, 0);
 
-        var fileStream = new FileStream(new SafeFileHandle(handle, false), FileAccess.Read);
-
-        var emulated = new EmulatedFile<Stream>(fileStream);
+        Native.SetFilePointerEx(handle, 0, IntPtr.Zero, 0);
+        var fileStream = new FileStream(new SafeFileHandle(handle, true), FileAccess.Read);
+        var emulated = new EmulatedFile<FileStream>(fileStream);
         _spdEmulator.RegisterFile(destinationPath, fileStream);
-        _framework.RegisterVirtualFile(destinationPath, emulated);
+        _framework.RegisterVirtualFile(destinationPath, emulated, false);
 
         _logger.Info("[SpdEmulatorApi] Registered spd {0} at {1}", sourcePath, destinationPath);
     }