commit 60354a0d6743bc9c8c43187edcb1680f0f88d508
author Adam Sawicki <Adam.Sawicki@amd.com> Wed Mar 25 17:47:56 2020 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> Wed Mar 25 17:47:56 2020 +0100
tree bc3a8c6ee2ad2e19c9518b43c24a27a693c4a7f2
parent 11f5b8471edd187676158c66ab8b2d10e212538e

Better validation in AllocatorPimpl::CreateAliasingResource

src/D3D12MemAlloc.cpp

diff --git a/src/D3D12MemAlloc.cpp b/src/D3D12MemAlloc.cpp
index cbe5d24..ce678ef 100644
--- a/src/D3D12MemAlloc.cpp
+++ b/src/D3D12MemAlloc.cpp
@@ -3942,7 +3942,8 @@
     const UINT64 existingSize = pAllocation->GetSize();

     const UINT64 newOffset = existingOffset + AllocationLocalOffset;

 

-    if(AllocationLocalOffset + resAllocInfo.SizeInBytes > existingSize ||

+    if(existingHeap == NULL ||

+        AllocationLocalOffset + resAllocInfo.SizeInBytes > existingSize ||

         newOffset % resAllocInfo.Alignment != 0)

     {

         return E_INVALIDARG;