修正：特定情况下在Lua中调用TArray的Add接口时内存对齐引起的问题 Tencent#668

xuyanghuang-tencent · xuyanghuang-tencent · commit 5eaaa3b235f5 · 2023-11-06T14:42:17.000+08:00
diff --git a/Plugins/UnLua/Source/UnLua/Private/ReflectionUtils/PropertyDesc.cpp b/Plugins/UnLua/Source/UnLua/Private/ReflectionUtils/PropertyDesc.cpp
@@ -1183,16 +1183,15 @@ class FScriptStructPropertyDesc : public FStructPropertyDesc
     explicit FScriptStructPropertyDesc(FProperty *InProperty)
         : FStructPropertyDesc(InProperty), StructName(*UnLua::LowLevel::GetMetatableName(StructProperty->Struct))
     {
-        StructSize = UnLua::LowLevel::CalculateSize(StructProperty->Struct);
+        const auto ScriptStruct = CastChecked<UScriptStruct>(StructProperty->Struct);
+        const auto CppStructOps = ScriptStruct->GetCppStructOps();
+        StructSize = CppStructOps ? CppStructOps->GetSize() : ScriptStruct->GetStructureSize();
         UserdataPadding = UnLua::LowLevel::CalculateUserdataPadding(StructProperty->Struct);
     }
 
-    FScriptStructPropertyDesc(FProperty *InProperty, bool bDynamicallyCreated)
-        : FStructPropertyDesc(InProperty), StructName(*UnLua::LowLevel::GetMetatableName(StructProperty->Struct))
+    virtual int32 GetSize() const override
     {
-        StructSize = UnLua::LowLevel::CalculateSize(StructProperty->Struct);
-        UserdataPadding = UnLua::LowLevel::CalculateUserdataPadding(StructProperty->Struct);
-        bFirstPropOfScriptStruct = false;
+        return StructSize;
     }
 
     virtual bool CopyBack(lua_State *L, int32 SrcIndexInStack, void *DestContainerPtr) override
diff --git a/Plugins/UnLua/Source/UnLua/Public/LowLevel.cpp b/Plugins/UnLua/Source/UnLua/Public/LowLevel.cpp
@@ -207,19 +207,6 @@ namespace UnLua
             return Userdata;
         }
 
-        int32 CalculateSize(UStruct* Struct)
-        {
-            if (Struct->IsA(UScriptStruct::StaticClass()))
-                return Struct->GetStructureSize();
-
-            const auto ScriptStruct = Cast<UScriptStruct>(Struct);
-            if (!ScriptStruct)
-                return 0;
-
-            const auto CppStructOps = ScriptStruct->GetCppStructOps();
-            return CppStructOps ? CppStructOps->GetSize() : ScriptStruct->GetStructureSize();
-        }
-
         uint8 CalculateUserdataPadding(UStruct* Struct)
         {
             const auto ScriptStruct = Cast<UScriptStruct>(Struct);
diff --git a/Plugins/UnLua/Source/UnLua/Public/LowLevel.h b/Plugins/UnLua/Source/UnLua/Public/LowLevel.h
@@ -68,8 +68,6 @@ namespace UnLua
 
         void* GetUserdata(lua_State* L, int32 Index, bool* OutTwoLvlPtr = nullptr, bool *OutClassMetatable = nullptr);
 
-        int32 CalculateSize(UStruct* Struct);
-
         uint8 CalculateUserdataPadding(UStruct* Struct);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1183,16 +1183,15 @@ class FScriptStructPropertyDesc : public FStructPropertyDesc`
`1183`	`1183`	`explicit FScriptStructPropertyDesc(FProperty *InProperty)`
`1184`	`1184`	`: FStructPropertyDesc(InProperty), StructName(*UnLua::LowLevel::GetMetatableName(StructProperty->Struct))`
`1185`	`1185`	`{`
`1186`		`- StructSize = UnLua::LowLevel::CalculateSize(StructProperty->Struct);`
	`1186`	`+ const auto ScriptStruct = CastChecked<UScriptStruct>(StructProperty->Struct);`
	`1187`	`+ const auto CppStructOps = ScriptStruct->GetCppStructOps();`
	`1188`	`+ StructSize = CppStructOps ? CppStructOps->GetSize() : ScriptStruct->GetStructureSize();`
`1187`	`1189`	`UserdataPadding = UnLua::LowLevel::CalculateUserdataPadding(StructProperty->Struct);`
`1188`	`1190`	`}`
`1189`	`1191`
`1190`		`- FScriptStructPropertyDesc(FProperty *InProperty, bool bDynamicallyCreated)`
`1191`		`- : FStructPropertyDesc(InProperty), StructName(*UnLua::LowLevel::GetMetatableName(StructProperty->Struct))`
	`1192`	`+ virtual int32 GetSize() const override`
`1192`	`1193`	`{`
`1193`		`- StructSize = UnLua::LowLevel::CalculateSize(StructProperty->Struct);`
`1194`		`- UserdataPadding = UnLua::LowLevel::CalculateUserdataPadding(StructProperty->Struct);`
`1195`		`- bFirstPropOfScriptStruct = false;`
	`1194`	`+ return StructSize;`
`1196`	`1195`	`}`
`1197`	`1196`
`1198`	`1197`	`virtual bool CopyBack(lua_State L, int32 SrcIndexInStack, void DestContainerPtr) override`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ namespace UnLua`
`68`	`68`
`69`	`69`	`void* GetUserdata(lua_State* L, int32 Index, bool* OutTwoLvlPtr = nullptr, bool *OutClassMetatable = nullptr);`
`70`	`70`
`71`		`- int32 CalculateSize(UStruct* Struct);`
`72`		`-`
`73`	`71`	`uint8 CalculateUserdataPadding(UStruct* Struct);`
`74`	`72`	`}`
`75`	`73`	`}`