izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added guards to stop property size calculation overflowing.

Browse Source 
#rb andriy.tylychko
#preflight 64523a0bc86798f65008c810

[CL 25317048 by steve robb in ue5-main branch]
This commit is contained in:
steve robb
2023-05-03 10:01:54 -04:00
parent 78d0770e85
commit a63282bc19
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Engine/Source/Runtime/CoreUObject/Private/UObject/Property.cpp
View File

@@ -1377,6 +1377,14 @@ EConvertFromTypeResult FProperty::ConvertFromType(const FPropertyTag& Tag, FStru
return EConvertFromTypeResult::UseSerializeItem;
}
namespace UE::CoreUObject::Private
{
[[noreturn]] void OnInvalidPropertySize(uint32 InvalidPropertySize, const FProperty* Prop)
{
UE_LOG(LogProperty, Fatal, TEXT("Invalid property size %u when linking property %s of size %d"), InvalidPropertySize, *Prop->GetFullName(), Prop->GetSize());
for (;;);
}
}
int32 FProperty::SetupOffset()
{
@@ -1390,7 +1398,13 @@ int32 FProperty::SetupOffset()
{
Offset_Internal = Align(0, GetMinAlignment());
}
return Offset_Internal + GetSize();
uint32 UnsignedTotal = (uint32)Offset_Internal + (uint32)GetSize();
if (UnsignedTotal >= (uint32)MAX_int32)
{
UE::CoreUObject::Private::OnInvalidPropertySize(UnsignedTotal, this);
}
return (int32)UnsignedTotal;
}
void FProperty::SetOffset_Internal(int32 NewOffset)