ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a crash during initialization of interfaces (bxc#8447)

Browse source 
GInterfaceInfo.Data was automatically set to be a GCHandle on the
interface adapter. But the generated GInterfaceInitHandlers were
not using it, just free'ing it.

But for the GInterface property support, the Data field is now used to
pass the class pointer, so casting it to a GCHandle to free it would
cause an exception.

We now don't assume anything about GInterfaceInfo.Data.
This commit is contained in:
Bertrand Lorentz 2012-11-17 17:34:50 +01:00
parent 05fb2e2f3a
commit 306f422c38
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/InterfaceGen.cs
View file

@ -114,8 +114,6 @@ namespace GtkSharp.Generation {
sw.WriteLine ("\t\t\tnative_iface." + vm.Name + " = iface." + vm.Name + ";"); sw.WriteLine ("\t\t\tnative_iface." + vm.Name + " = iface." + vm.Name + ";");
} }
sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);"); sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);");
sw.WriteLine ("\t\t\tGCHandle gch = (GCHandle) data;");
sw.WriteLine ("\t\t\tgch.Free ();");
} }
foreach (Property prop in Properties.Values) { foreach (Property prop in Properties.Values) {

7
glib/GInterfaceAdapter.cs
View file

@ -55,12 +55,7 @@ namespace GLib {
public abstract IntPtr Handle { get; } public abstract IntPtr Handle { get; }
internal GInterfaceInfo Info { internal GInterfaceInfo Info {
get { get { return info; }
if (info.Data == IntPtr.Zero)
info.Data = (IntPtr) GCHandle.Alloc (this);
return info;
}
} }
} }
} }