fix: Critical premature free bug

trungnt2910 · trungnt2910 · commit 0e7959cbf562 · 2021-08-25T16:07:34.000+07:00
diff --git a/MemoryModule/NativeAssembly.cs b/MemoryModule/NativeAssembly.cs
@@ -172,17 +172,16 @@ protected static bool FreeLibraryHandle(IntPtr handle)
             {
                 try
                 {
-                    if (handle != IntPtr.Zero)
+                    if (handle != IntPtr.Zero && _handles.ContainsKey(handle))
                     {
                         var info = _handles[handle];
-
-                        NativeAssemblyImpl.FreeLibrary(handle);
-                        _handles.Remove(handle);
-
                         --info.RefCount;
 
                         if (info.RefCount == 0)
                         {
+                            NativeAssemblyImpl.FreeLibrary(handle);
+                            _handles.Remove(handle);
+
                             var nameSet = _libraryMap[info.Name];
                             nameSet.Remove(handle);
 

Original file line number	Diff line number	Diff line change
`@@ -172,17 +172,16 @@ protected static bool FreeLibraryHandle(IntPtr handle)`
`172`	`172`	`{`
`173`	`173`	`try`
`174`	`174`	`{`
`175`		`- if (handle != IntPtr.Zero)`
	`175`	`+ if (handle != IntPtr.Zero && _handles.ContainsKey(handle))`
`176`	`176`	`{`
`177`	`177`	`var info = _handles[handle];`
`178`		`-`
`179`		`- NativeAssemblyImpl.FreeLibrary(handle);`
`180`		`- _handles.Remove(handle);`
`181`		`-`
`182`	`178`	`--info.RefCount;`
`183`	`179`
`184`	`180`	`if (info.RefCount == 0)`
`185`	`181`	`{`
	`182`	`+ NativeAssemblyImpl.FreeLibrary(handle);`
	`183`	`+ _handles.Remove(handle);`
	`184`	`+`
`186`	`185`	`var nameSet = _libraryMap[info.Name];`
`187`	`186`	`nameSet.Remove(handle);`
`188`	`187`