Merge branch 'main' of https://github.com/nanoframework/nf-interpreter …

…into orgpal-mesh
OrgPal · Oct 11, 2023 · 9aa3770 · 9aa3770
2 parents 2535bc4 + 8bc42da
commit 9aa3770
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/CLR/Core/CLR_RT_HeapCluster.cpp b/src/CLR/Core/CLR_RT_HeapCluster.cpp
@@ -107,6 +107,10 @@ CLR_RT_HeapBlock *CLR_RT_HeapCluster::ExtractBlocks(CLR_UINT32 dataType, CLR_UIN
             if (available >= length)
             {
                 res = ptr;
+
+                _ASSERTE((void *)res >= (void *)s_CLR_RT_Heap.m_location);
+                _ASSERTE((void *)res < (void *)(s_CLR_RT_Heap.m_location + s_CLR_RT_Heap.m_size));
+
                 break;
             }
         }
@@ -120,18 +124,29 @@ CLR_RT_HeapBlock *CLR_RT_HeapCluster::ExtractBlocks(CLR_UINT32 dataType, CLR_UIN
 
         available -= length;
 
+        _ASSERTE((void *)next >= (void *)s_CLR_RT_Heap.m_location);
+        _ASSERTE((void *)next < (void *)(s_CLR_RT_Heap.m_location + s_CLR_RT_Heap.m_size));
+        _ASSERTE((void *)prev >= (void *)s_CLR_RT_Heap.m_location);
+        _ASSERTE((void *)prev < (void *)(s_CLR_RT_Heap.m_location + s_CLR_RT_Heap.m_size));
+
         if (available != 0)
         {
             if (flags & CLR_RT_HeapBlock::HB_Event)
             {
                 res->SetDataId(CLR_RT_HEAPBLOCK_RAW_ID(DATATYPE_FREEBLOCK, CLR_RT_HeapBlock::HB_Pinned, available));
 
                 res += available;
+
+                _ASSERTE((void *)res >= (void *)s_CLR_RT_Heap.m_location);
+                _ASSERTE((void *)res < (void *)(s_CLR_RT_Heap.m_location + s_CLR_RT_Heap.m_size));
             }
             else
             {
                 CLR_RT_HeapBlock_Node *ptr = &res[length];
 
+                _ASSERTE((void *)ptr >= (void *)s_CLR_RT_Heap.m_location);
+                _ASSERTE((void *)ptr < (void *)(s_CLR_RT_Heap.m_location + s_CLR_RT_Heap.m_size));
+
                 //
                 // Relink to the new free block.
                 //