~ CEnum: fix crash if name index is out of range

WolvenKit · Dec 19, 2022 · 85c9d62 · 85c9d62
1 parent 725739d
commit 85c9d62
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/WolvenKit.CR2W/Types/Primitive/NetPrimitive/CEnum.cs b/WolvenKit.CR2W/Types/Primitive/NetPrimitive/CEnum.cs
@@ -85,7 +85,7 @@ public override void Read(BinaryReader file, uint size)
                 while (true)
                 {
                     var idx = file.ReadUInt16();
-                    if (idx == 0)
+                    if (idx <= 0 || idx >= cr2w.names.Count)
                         break;
 
                     string s = cr2w.names[idx].Str;
@@ -97,9 +97,12 @@ public override void Read(BinaryReader file, uint size)
             {
                 var idx = file.ReadUInt16();
 
-                string s = cr2w.names[idx].Str;
+                if (idx < cr2w.names.Count && idx >= 0)
+                {
+                    string s = cr2w.names[idx].Str;
 
-                strings.Add(s);
+                    strings.Add(s);
+                }
             }
 
             SetValue(strings);