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

Fix for null access when verifying ScriptAndPropertyObjectReferences

Browse Source 
#rb none


#ROBOMERGE-SOURCE: CL 12216380 via CL 12216408
#ROBOMERGE-BOT: (v662-12191386)

[CL 12216450 by robert manuszewski in Main branch]
This commit is contained in:
robert manuszewski
2020-03-16 14:47:37 -04:00
parent 71396d8aea
commit cd1104dedb
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Engine/Source/Runtime/CoreUObject/Private/UObject/Class.cpp
View File

@@ -954,16 +954,24 @@ void UStruct::Link(FArchive& Ar, bool bRelinkExistingProperties)
// for classes and functions. We have to babysit these, just as we do
// for bytecode references (reusing the AddReferencingScriptExpr fn).
// Long term we should not use placeholder objects like this:
for(int32 I = 0; I < ScriptAndPropertyObjectReferences.Num(); ++I)
for(int32 ReferenceIndex = ScriptAndPropertyObjectReferences.Num() - 1; ReferenceIndex >= 0; --ReferenceIndex)
{
if (ULinkerPlaceholderClass* PlaceholderObj = Cast<ULinkerPlaceholderClass>(ScriptAndPropertyObjectReferences[I]))
if (ScriptAndPropertyObjectReferences[ReferenceIndex])
{
// let the placeholder track the reference to it:
PlaceholderObj->AddReferencingScriptExpr(reinterpret_cast<UClass**>(&ScriptAndPropertyObjectReferences[I]));
if (ULinkerPlaceholderClass* PlaceholderObj = Cast<ULinkerPlaceholderClass>(ScriptAndPropertyObjectReferences[ReferenceIndex]))
{
// let the placeholder track the reference to it:
PlaceholderObj->AddReferencingScriptExpr(reinterpret_cast<UClass**>(&ScriptAndPropertyObjectReferences[ReferenceIndex]));
}
// I don't currently see how placeholder functions could be present in this list, but that's
// a dangerous assumption.
ensure(!(ScriptAndPropertyObjectReferences[ReferenceIndex]->IsA<ULinkerPlaceholderFunction>()));
}
else
{
// It's possible that in the process of recompilation one of the refernces got GC'd leaving a null ptr in the array
ScriptAndPropertyObjectReferences.RemoveAt(ReferenceIndex);
}
// I don't currently see how placeholder functions could be present in this list, but that's
// a dangerous assumption.
ensure(!(ScriptAndPropertyObjectReferences[I]->IsA<ULinkerPlaceholderFunction>()));
}
#endif // USE_CIRCULAR_DEPENDENCY_LOAD_DEFERRING
}