gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GC issue in c#

Browse Source 
Store a reference to the unmanaged delegate so that the c# garbage collector doesn't wipe it out which causes a hard crash since the unmanaged dll is still referencing it.
This commit is contained in:
MoogleTroupe
2021-03-09 20:52:24 -05:00
committed by GitHub
parent e6b439acb5
commit 5ba67d918d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bindings/csharp/Node.cs
View File

@@ -39,6 +39,7 @@ namespace ZeroTier.Core
string _configFilePath; string _configFilePath;
ushort _servicePort; ushort _servicePort;
static ZeroTierManagedEventCallback _managedCallback; static ZeroTierManagedEventCallback _managedCallback;
CSharpCallbackWithStruct _unmanagedCallback;
// Callback used internally to ferry events from the C++ layer // Callback used internally to ferry events from the C++ layer
static void OnZeroTierEvent(IntPtr msgPtr) static void OnZeroTierEvent(IntPtr msgPtr)
@@ -226,7 +227,8 @@ namespace ZeroTier.Core
if (_hasBeenFreed == true) { if (_hasBeenFreed == true) {
throw new ObjectDisposedException("ZeroTier Node has previously been freed. Restart application to create new instance."); throw new ObjectDisposedException("ZeroTier Node has previously been freed. Restart application to create new instance.");
} }
return zts_start(_configFilePath,OnZeroTierEvent,_servicePort); _unmanagedCallback = OnZeroTierEvent;
return zts_start(_configFilePath,_unmanagedCallback,_servicePort);
} }
/// <summary> /// <summary>