Fix bug in which invalid data in the userentries would result in a crash

BrawlCrate/ExternalInterfacing/ColorSmash.cs

@@ -1,6 +1,5 @@
 using BrawlCrate.NodeWrappers;
 using BrawlCrate.UI;
-using BrawlLib.Internal;
 using BrawlLib.Internal.Windows.Forms;
 using BrawlLib.SSBB.ResourceNodes;
 using BrawlLib.Wii.Textures;

BrawlLib/Internal/ObjectExtension.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Windows.Markup;
 
 namespace BrawlLib.Internal
 {

BrawlLib/SSBB/ResourceNodes/Animations/CHR0Node.cs

@@ -118,7 +118,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 return header->Group->_numEntries > 0;
             }

BrawlLib/SSBB/ResourceNodes/Animations/CLR0Node.cs

@@ -71,7 +71,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 return header->Group->_numEntries > 0;
             }

BrawlLib/SSBB/ResourceNodes/Animations/PAT0Node.cs

@@ -175,7 +175,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 //Get texture strings
                 for (int i = 0; i < texPtr; i++)

BrawlLib/SSBB/ResourceNodes/Animations/SHP0Node.cs

@@ -133,7 +133,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 return header->Group->_numEntries > 0;
             }

BrawlLib/SSBB/ResourceNodes/Animations/SRT0Node.cs

@@ -114,7 +114,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 return header->Group->_numEntries > 0;
             }

BrawlLib/SSBB/ResourceNodes/Animations/VIS0Node.cs

@@ -77,7 +77,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 return header->Group->_numEntries > 0;
             }

BrawlLib/SSBB/ResourceNodes/Graphics/PLT0Node.cs

@@ -65,7 +65,7 @@ public override bool OnInitialize()
 
             if (_version == 3)
             {
-                (_userEntries = new UserDataCollection()).Read(Header3->UserData);
+                (_userEntries = new UserDataCollection()).Read(Header3->UserData, WorkingUncompressed);
             }
 
             return false;

BrawlLib/SSBB/ResourceNodes/Graphics/TEX0Node.cs

@@ -257,7 +257,7 @@ public override bool OnInitialize()
 
             if (_version == 3)
             {
-                (_userEntries = new UserDataCollection()).Read(Header3->UserData);
+                (_userEntries = new UserDataCollection()).Read(Header3->UserData, WorkingUncompressed);
             }
 
             return false;

BrawlLib/SSBB/ResourceNodes/MDL0/MDL0BoneNode.cs

@@ -657,7 +657,7 @@ public override bool OnInitialize()
 
             _extents = header->_extents;
 
-            (_userEntries = new UserDataCollection()).Read(header->UserDataAddress);
+            (_userEntries = new UserDataCollection()).Read(header->UserDataAddress, WorkingUncompressed);
 
             //We don't want to process children because not all have been parsed yet.
             //Child assignments will be handled by the parent group.

BrawlLib/SSBB/ResourceNodes/MDL0/MDL0MaterialNode.cs

@@ -1598,7 +1598,7 @@ public override bool OnInitialize()
             (_chan1 = Light->Channel1)._parent = this;
             (_chan2 = Light->Channel2)._parent = this;
 
-            (_userEntries = new UserDataCollection()).Read(header->UserData(_initVersion));
+            (_userEntries = new UserDataCollection()).Read(header->UserData(_initVersion), WorkingUncompressed);
 
             return true;
         }

BrawlLib/SSBB/ResourceNodes/MDL0/MDL0Node.cs

@@ -2477,7 +2477,7 @@ public override bool OnInitialize()
                 }
             }
 
-            (_userEntries = new UserDataCollection()).Read(header->UserData);
+            (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
             return true;
         }

BrawlLib/SSBB/ResourceNodes/SCN0/SCN0CameraNode.cs

@@ -73,7 +73,7 @@ public override bool OnInitialize()
             _projType = (ProjectionType) (int) Data->_projectionType;
 
             //Read user data
-            (_userEntries = new UserDataCollection()).Read(Data->UserData);
+            (_userEntries = new UserDataCollection()).Read(Data->UserData, WorkingUncompressed);
 
             return false;
         }

BrawlLib/SSBB/ResourceNodes/SCN0/SCN0LightNode.cs

@@ -447,7 +447,7 @@ public override bool OnInitialize()
             _spotFunc = Data->_spotFunc;
 
             //Read user data
-            (_userEntries = new UserDataCollection()).Read(Data->UserData);
+            (_userEntries = new UserDataCollection()).Read(Data->UserData, WorkingUncompressed);
 
             //Don't bother reading data if the entry is null
             if (Name == "<null>")

BrawlLib/SSBB/ResourceNodes/SCN0/SCN0Node.cs

@@ -145,7 +145,7 @@ public override bool OnInitialize()
                     _originalPath = header->OrigPath;
                 }
 
-                (_userEntries = new UserDataCollection()).Read(header->UserData);
+                (_userEntries = new UserDataCollection()).Read(header->UserData, WorkingUncompressed);
 
                 return header->Group->_numEntries > 0;
             }

BrawlLib/SSBB/ResourceNodes/Stage Tables/TBCLNode.cs

@@ -1,5 +1,4 @@
 using BrawlLib.Internal;
-using BrawlLib.SSBB.Types.ProjectPlus;
 using BrawlLib.SSBB.Types.Stage_Tables;
 using System;
 using System.ComponentModel;

BrawlLib/SSBB/UserData.cs

@@ -1,4 +1,5 @@
 using BrawlLib.Internal;
+using BrawlLib.SSBB.ResourceNodes;
 using BrawlLib.SSBB.Types;
 using System;
 using System.Collections;
@@ -60,7 +61,7 @@ public override void SetValue(object component, object value)
 
     public unsafe class UserDataCollection : CollectionBase, ICustomTypeDescriptor
     {
-        public void Read(VoidPtr userDataAddr)
+        public void Read(VoidPtr userDataAddr, DataSource src)
         {
             if (userDataAddr == null)
             {
@@ -73,7 +74,11 @@ public void Read(VoidPtr userDataAddr)
             int count = group->_numEntries;
             for (int i = 0; i < count; i++, pEntry++)
             {
+                if (pEntry->_dataOffset > src.Length)
+                    break;
                 UserDataEntry* entry = (UserDataEntry*) ((VoidPtr) group + pEntry->_dataOffset);
+                if (pEntry->_dataOffset + entry->_dataOffset > src.Length)
+                    break;
                 UserDataClass d = new UserDataClass {_name = new string((sbyte*) group + pEntry->_stringOffset)};
                 VoidPtr addr = (VoidPtr) entry + entry->_dataOffset;
                 d._type = entry->Type;