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

Avoid calling memcpywith nullptr argument when TArray::operator== is invoked on two empty arrays.

Browse Source 
#rb steve.robb



#preflight 627c01de1e749933439e6921

#ROBOMERGE-AUTHOR: andy.sonnenburg
#ROBOMERGE-SOURCE: CL 20147512 via CL 20148803 via CL 20150489 via CL 20151057
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20154307 by andy sonnenburg in ue5-main branch]
This commit is contained in:
andy sonnenburg
2022-05-11 19:39:34 -04:00
parent e45cc77314
commit c92909d7cb
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Engine/Source/Runtime/Core/Private/Containers/ContainersTest.cpp
View File

@@ -2,6 +2,7 @@
#include "CoreTypes.h"
#include "Misc/AssertionMacros.h"
#include "Concepts/EqualityComparable.h"
#include "Containers/Array.h"
#include "Containers/Map.h"
#include "Containers/Set.h"
@@ -236,6 +237,15 @@ namespace
}
}
template <typename Container>
void CheckContainerSelfEquality(Container& Cont)
{
if constexpr (TModels<CEqualityComparable, Container>::Value)
{
check(Cont == Cont);
}
}
template <typename Container>
void CheckContainerNum(Container& Cont)
{
@@ -312,6 +322,7 @@ namespace
CheckContainerNum(Cont);
CheckContainerEnds(Cont);
CheckContainerElements(Cont);
CheckContainerSelfEquality(Cont);
}
for (int32 N = 0; N != Count; ++N)
@@ -320,6 +331,7 @@ namespace
CheckContainerNum(Cont);
CheckContainerEnds(Cont);
CheckContainerElements(Cont);
CheckContainerSelfEquality(Cont);
}
for (int32 N = 0; N != Count; ++N)
@@ -328,6 +340,7 @@ namespace
CheckContainerNum(Cont);
CheckContainerEnds(Cont);
CheckContainerElements(Cont);
CheckContainerSelfEquality(Cont);
}
for (int32 N = 0; N != Count; ++N)
@@ -336,10 +349,18 @@ namespace
CheckContainerNum(Cont);
CheckContainerEnds(Cont);
CheckContainerElements(Cont);
CheckContainerSelfEquality(Cont);
}
}
}
template <typename Container>
void RunEmptyContainerSelfEqualityTest()
{
Container Cont;
CheckContainerSelfEquality(Cont);
}
template <typename ContainerType, typename KeyType>
void RunPerformanceTest(const FString& Description, int32 NumObjects, int32 NumOperations)
{
@@ -508,6 +529,8 @@ bool FContainersFullTest::RunTest(const FString& Parameters)
RunContainerTests<TSortedMap<FString, FContainerTestValueType>, FString>();
RunContainerTests<TSortedMap<FString, FContainerTestValueType, TInlineAllocator<64>>, FString>();
RunEmptyContainerSelfEqualityTest<TArray<int32>>();
// Verify use of FName index sorter with SortedMap
TSortedMap<FName, int32, FDefaultAllocator, FNameFastLess> NameMap;

2
Engine/Source/Runtime/Core/Public/Templates/MemoryOps.h
View File

@@ -248,7 +248,7 @@ FORCEINLINE bool CompareItems(const ElementType* A, const ElementType* B, SizeTy
{
if constexpr (TTypeTraits<ElementType>::IsBytewiseComparable)
{
return !FMemory::Memcmp(A, B, sizeof(ElementType) * Count);
return !Count || !FMemory::Memcmp(A, B, sizeof(ElementType) * Count);
}
else
{