Fixup support for newer (> 2022) versions.

Author: SamboyCoding

UMS.Analysis/Structures/Objects/StringFieldValue.cs

@@ -38,6 +38,14 @@ public StringFieldValue(SnapshotFile file, Span<byte> data)
         data = managedObjectInfo.Data;
 
         var offset = file.VirtualMachineInformation.ObjectHeaderSize + 4;
+        
+        if(offset > data.Length)
+        {
+            FailedToParse = true;
+            FailedParseFromPtr = ptr;
+            return;
+        }
+        
         var stringPtr = data[offset..];
 
         var end = stringPtr.LastIndexOf(new byte[] { 0, 0 });

UMS.LowLevel/LowLevelSnapshotFile.cs

@@ -86,8 +86,11 @@ public unsafe LowLevelSnapshotFile(string path)
         ReadMetadataForAllChapters(entryTypeToChapterOffset);
 
         VirtualMachineInformation = ReadChapterAsStruct<VirtualMachineInformation>(EntryType.Metadata_VirtualMachineInformation);
+
+        var areHeapAddressesEncoded = SnapshotFormatVersion >= FormatVersion.MemLabelSizeAndHeapIdVersion;
+        
         ManagedHeapSectionStartAddresses = ReadValueTypeChapter<ulong>(EntryType.ManagedHeapSections_StartAddress, 0, -1).ToArray()
-            .Select((a, i) => new ManagedHeapSection(a, ReadChapterBody(EntryType.ManagedHeapSections_Bytes, i, 1)))
+            .Select((a, i) => new ManagedHeapSection(a,  areHeapAddressesEncoded, ReadChapterBody(EntryType.ManagedHeapSections_Bytes, i, 1)))
             .ToArray();
 
         Array.Sort(ManagedHeapSectionStartAddresses);

UMS.LowLevel/Structures/EntryType.cs

@@ -86,5 +86,23 @@ public enum EntryType : ushort
     NativeAllocatorInfo_PeakUsedSize,
     NativeAllocatorInfo_AllocationCount,
     NativeAllocatorInfo_Flags, //80
+    // NativeObjectMetaDataVersion = 15
+    // Adds meta data
+    ObjectMetaData_MetaDataBufferIndicies,
+    ObjectMetaData_MetaDataBuffer,
+    // SystemMemoryRegionsVersion = 16
+    // Adds system memory regions
+    SystemMemoryRegions_Address,
+    SystemMemoryRegions_Size,
+    SystemMemoryRegions_Resident,
+    SystemMemoryRegions_Type,
+    SystemMemoryRegions_Name,
+    // SystemMemoryResidentPagesVersion = 17
+    // Adds system memory resident pages
+    SystemMemoryResidentPages_Address,
+    SystemMemoryResidentPages_FirstPageIndex,
+    SystemMemoryResidentPages_LastPageIndex,
+    SystemMemoryResidentPages_PagesState,
+    SystemMemoryResidentPages_PageSize,
     Count, //used to keep track of entry count, only add c++ matching entries above this one
 }

UMS.LowLevel/Structures/FormatVersion.cs

@@ -6,6 +6,11 @@ public enum FormatVersion : uint
     NativeConnectionsAsInstanceIdsVersion = 10, //native object collection reworked, added new gchandleIndex array to native objects for fast managed object access (2019.3 or newer?)
     ProfileTargetInfoAndMemStatsVersion = 11, //added profile target info and memory summary struct (shortly before 2021.2.0a12 on 2021.2, backported together with v.12)
     MemLabelSizeAndHeapIdVersion = 12, //added gc heap / vm heap identification encoded within each heap address and memory label size reporting (2021.2.0a12, 2021.1.9, 2020.3.12f1, 2019.4.29f1 or newer)
+    // below are present from 2022.2+
     SceneRootsAndAssetBundlesVersion = 13, //added scene roots and asset bundle relations (not yet landed)
-    GfxResourceReferencesAndAllocatorsVersion = 14 //added gfx resource to root mapping and allocators information (including extra allocator information to memory labels)
+    GfxResourceReferencesAndAllocatorsVersion = 14, //added gfx resource to root mapping and allocators information (including extra allocator information to memory labels)
+    NativeObjectMetaDataVersion = 15, // adds the ability to get meta data for native objects
+    SystemMemoryRegionsVersion = 16, // adds system memory regions information
+    // below are present from 2023.1+
+    SystemMemoryResidentPagesVersion = 17, // adds system memory resident pages information
 }

UMS.LowLevel/Structures/ManagedHeapSection.cs

@@ -2,13 +2,27 @@
 
 public class ManagedHeapSection : IComparable
 {
+    private const ulong referenceBit = 1UL << 63; 
+    
     public ulong VirtualAddress;
     public ulong VirtualAddressEnd;
     public byte[] Heap;
 
-    public ManagedHeapSection(ulong virtualAddress, byte[] heap)
+    public bool IsVmSection;
+
+    public ManagedHeapSection(ulong virtualAddress, bool areAddressesEncoded, byte[] heap)
     {
-        VirtualAddress = virtualAddress;
+        if (areAddressesEncoded)
+        {
+            VirtualAddress = virtualAddress & ~referenceBit;
+            IsVmSection = (virtualAddress & referenceBit) != 0;
+        }
+        else
+        {
+            VirtualAddress = virtualAddress;
+            IsVmSection = false;
+        }
+
         Heap = heap;
         VirtualAddressEnd = VirtualAddress + (ulong) Heap.Length;
     }