GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rare crash when passing array to managed world with object refs inside structures

Browse Source
This commit is contained in:
Wojtek Figat
2021-07-16 11:02:49 +02:00
parent 5852887e7d
commit d0eed29f31
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -2024,6 +2024,7 @@ namespace Flax.Build.Bindings
fields = classInfo.Fields;
else
throw new Exception("Not supported Non-POD type " + apiType);
CppIncludeFiles.Add("Engine/Scripting/ManagedCLR/MClass.h");
// Get the full typename with nested parent prefix
var fullName = apiType.FullNameNative;
@@ -2079,8 +2080,13 @@ namespace Flax.Build.Bindings
header.Append(" }").AppendLine();
header.AppendFormat(" void ToManagedArray(MonoArray* result, const Span<{0}>& data)", fullName).AppendLine();
header.Append(" {").AppendLine();
header.AppendFormat(" MonoClass* klass = {0}::TypeInitializer.GetType().ManagedClass->GetNative();", fullName).AppendLine();
header.Append(" ASSERT(klass);").AppendLine();
header.Append(" for (int32 i = 0; i < data.Length(); i++)").AppendLine();
header.AppendFormat(" mono_array_set(result, {0}Managed, i, ToManaged(data[i]));", apiType.Name).AppendLine();
header.Append(" {").AppendLine();
header.Append(" auto managed = ToManaged(data[i]);").AppendLine();
header.AppendFormat(" mono_value_copy(mono_array_addr(result, {0}Managed, i), &managed, klass);", apiType.Name).AppendLine();
header.Append(" }").AppendLine();
header.Append(" }").AppendLine();
header.Append(" template<typename AllocationType = HeapAllocation>").AppendLine();
header.AppendFormat(" void ToNativeArray(Array<{0}, AllocationType>& result, MonoArray* data, int32 length)", fullName).AppendLine();