fix leaked handle with registering bmd

Sewer56 · Mar 26, 2024 · b21825b · b21825b
2 parents a412902 + 20f55a1
commit b21825b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/Emulator/AWB.Stream.Emulator/ModConfig.json b/Emulator/AWB.Stream.Emulator/ModConfig.json
@@ -10,7 +10,7 @@
   "ModR2RManagedDll64": "x64/AWB.Stream.Emulator.dll",
   "ModNativeDll32": "",
   "ModNativeDll64": "",
-  "IsLibrary": false,
+  "IsLibrary": true,
   "ReleaseMetadataFileName": "AWB.Stream.Emulator.ReleaseMetadata.json",
   "PluginData": {
     "GitHubDependencies": {

diff --git a/Emulator/BMD.File.Emulator/BmdEmulator.cs b/Emulator/BMD.File.Emulator/BmdEmulator.cs
@@ -142,7 +142,11 @@ public void OnModLoading(string modFolder)
     /// Invalidates a BMD file with a specified name.
     /// </summary>
     /// <param name="bmdPath">Full path to the file.</param>
-    public void UnregisterFile(string bmdPath) => _pathToStream!.Remove(bmdPath, out _);
+    public void UnregisterFile(string bmdPath)
+    {
+        _pathToStream!.Remove(bmdPath, out var stream);
+        stream?.Dispose();
+    }
 
     public void RegisterFile(string destinationPath, Stream stream)
     {

diff --git a/Emulator/BMD.File.Emulator/BmdEmulatorApi.cs b/Emulator/BMD.File.Emulator/BmdEmulatorApi.cs
@@ -59,12 +59,9 @@ public void RegisterBmd(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);
-        _bmdEmulator.RegisterFile(destinationPath, stream);
+        var fileStream = new FileStream(new SafeFileHandle(handle, true), FileAccess.Read);
+        var emulated = new EmulatedFile<FileStream>(fileStream);
+        _bmdEmulator.RegisterFile(destinationPath, fileStream);
         _framework.RegisterVirtualFile(destinationPath, emulated, false);
 
         _logger.Info("[BmdEmulatorApi] Registered bmd {0} at {1}", sourcePath, destinationPath);