mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix iOS crash with null GCHandles

Browse source
This commit is contained in:
Sylvain Berfini 2017-05-09 14:17:38 +02:00
parent 0e58a367b2
commit 1d865de878
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wrappers/csharp/wrapper_impl.mustache
View file

@ -122,9 +122,9 @@ namespace Linphone
~LinphoneObject()
{
//Console.WriteLine("Destroying" + this.ToString());
//Console.WriteLine("Destroying " + this.ToString());
if (nativePtr != IntPtr.Zero) {
//Console.WriteLine("Unreffing" + this.ToString());
//Console.WriteLine("Unreffing " + this.ToString());
belle_sip_object_unref(nativePtr);
}
}
@ -136,14 +136,14 @@ namespace Linphone
if (objPtr == IntPtr.Zero)
{
T obj = new T();
//Console.WriteLine("Creating" + obj.ToString());
//Console.WriteLine("Creating " + obj.ToString());
if (takeRef)
{
ptr = belle_sip_object_ref(ptr);
//Console.WriteLine("Reffing" + obj.ToString());
//Console.WriteLine("Reffing " + obj.ToString());
}
obj.nativePtr = ptr;
GCHandle handle = GCHandle.Alloc(obj, GCHandleType.Weak);
GCHandle handle = GCHandle.Alloc(obj, GCHandleType.WeakTrackResurrection);
objPtr = GCHandle.ToIntPtr(handle);
belle_sip_object_data_set(ptr, "cs_obj", objPtr, onDataDestroyed);
return obj;
@ -152,11 +152,7 @@ namespace Linphone
{
GCHandle handle = GCHandle.FromIntPtr(objPtr);
T obj = (T)handle.Target;
if (takeRef)
{
obj.nativePtr = belle_sip_object_ref(obj.nativePtr);
//Console.WriteLine("Reffing" + obj.ToString());
}
//Console.WriteLine("Using existing " + obj.ToString());
return obj;
}
}