Dispose AssemblyDefiniton objects when finished with them

BepInEx · Sep 18, 2020 · 8d4f63a · 8d4f63a
1 parent 7c556e0
commit 8d4f63a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/AssemblyUnhollower/Contexts/RewriteGlobalContext.cs b/AssemblyUnhollower/Contexts/RewriteGlobalContext.cs
@@ -1,11 +1,12 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using AssemblyUnhollower.Extensions;
 using Mono.Cecil;
 
 namespace AssemblyUnhollower.Contexts
 {
-    public class RewriteGlobalContext
+    public class RewriteGlobalContext : IDisposable
     {
         public UnhollowerOptions Options { get; }
         private readonly Dictionary<string, AssemblyRewriteContext> myAssemblies = new Dictionary<string, AssemblyRewriteContext>();
@@ -33,7 +34,7 @@ public RewriteGlobalContext(UnhollowerOptions options, IEnumerable<string> sourc
                 var assemblyName = Path.GetFileNameWithoutExtension(sourceAssemblyPath);
                 if(assemblyName == "Il2CppDummyDll") continue;
 
-                var sourceAssembly = AssemblyDefinition.ReadAssembly(File.OpenRead(sourceAssemblyPath), new ReaderParameters(ReadingMode.Immediate) {MetadataResolver = metadataResolver});
+                var sourceAssembly = AssemblyDefinition.ReadAssembly(sourceAssemblyPath, new ReaderParameters(ReadingMode.Immediate) {MetadataResolver = metadataResolver});
                 myAssemblyResolver.Register(sourceAssembly);
                 var newAssembly = AssemblyDefinition.CreateAssembly(
                     new AssemblyNameDefinition(sourceAssembly.Name.Name.UnSystemify(), sourceAssembly.Name.Version),
@@ -80,5 +81,14 @@ public AssemblyRewriteContext GetAssemblyByName(string name)
         {
             return myAssemblies.TryGetValue(name, out var result) ? result : null;
         }
+
+        public void Dispose()
+        {
+	        foreach (var assembly in Assemblies)
+	        {
+		        assembly.NewAssembly.Dispose();
+                assembly.OriginalAssembly.Dispose();
+	        }
+        }
     }
 }
diff --git a/AssemblyUnhollower/Program.cs b/AssemblyUnhollower/Program.cs
@@ -228,6 +228,8 @@ public static void Main(UnhollowerOptions options)
             File.Copy(typeof(Decoder).Assembly.Location, Path.Combine(options.OutputDir, typeof(Decoder).Assembly.GetName().Name + ".dll"), true);
 
             Console.WriteLine("Done!");
+
+            rewriteContext.Dispose();
         }
     }
 }