Fix crash when a REL object incorrectly points outside of memory

soopercool101 · Mar 1, 2024 · 7c2a632 · 7c2a632
1 parent e14724e
commit 7c2a632
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/BrawlLib/SSBB/ResourceNodes/Modules/RELObjectParser.cs b/BrawlLib/SSBB/ResourceNodes/Modules/RELObjectParser.cs
@@ -53,12 +53,12 @@ private unsafe RELType ParseDeclaration(int index)
             }
 
             uint relOffset = cmd.Apply(Manager.GetUint(index), 0);
-            if (relOffset > _objectSection._dataOffset + _objectSection._dataSize)
+            if (relOffset > _objectSection._dataOffset + _objectSection._dataSize || relOffset > _objectSection.WorkingUncompressed.Length)
             {
                 return null;
             }
 
-            string name = new string((sbyte*) (_objectSection.Header + relOffset));
+            string name = (_objectSection.Header + relOffset).GetUTF8String();
 
             if (string.IsNullOrWhiteSpace(name))
             {