Parse malformed Oblivion string lists better

#549
Mutagen-Modding · Oct 13, 2024 · 89142da · 89142da
1 parent dadc93a
commit 89142da
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/Mutagen.Bethesda.Core/Plugins/Binary/Overlay/BinaryOverlayList.cs b/Mutagen.Bethesda.Core/Plugins/Binary/Overlay/BinaryOverlayList.cs
@@ -599,7 +599,10 @@ public static IReadOnlyList<T> FactoryByLazyParseWithTrigger<T>(
         var subLen = finalPos - stream.Position;
         var mem = stream.RemainingMemory.Slice(0, subLen);
 
-        if (trimNullSuffix && mem.Length > 0 && mem[^1] == 0)
+        if (trimNullSuffix
+            && mem.Length > 1 
+            && mem[^1] == 0
+            && mem[^2] == 0)
         {
             mem = mem.Slice(0, mem.Length - 1);
         }

diff --git a/Mutagen.Bethesda.Core/Translations/Binary/ListBinaryTranslation.cs b/Mutagen.Bethesda.Core/Translations/Binary/ListBinaryTranslation.cs
@@ -41,7 +41,7 @@ public ExtendedList<TItem> ParseTrimNullEnding(
         BinarySubParseDelegate<TReader, TItem> transl)
     {
         var ret = new ExtendedList<TItem>();
-        while (reader.Remaining > 1 || reader.GetUInt8() != 0)
+        while (reader.Remaining > 1)
         {
             if (transl(reader, out var subItem))
             {

diff --git a/Mutagen.Bethesda.Testing/Files/Oblivion/malformedstringlists.esp b/Mutagen.Bethesda.Testing/Files/Oblivion/malformedstringlists.esp
diff --git a/Mutagen.Bethesda.Testing/TestDataPathing.cs b/Mutagen.Bethesda.Testing/TestDataPathing.cs
@@ -20,6 +20,7 @@ public class TestDataPathing
     public static ModPath SkyrimPerkFunctionParametersTypeNone = ModPath.FromPath("Files/Skyrim/SkyrimPerkFunctionParametersTypeNone.esp");
     public static string OblivionRegion = "Files/Oblivion/Region/OblivionRegion.esp";
     public static string OblivionStringLists = "Files/Oblivion/stringlists.esp";
+    public static string OblivionMalformedStringLists = "Files/Oblivion/malformedstringlists.esp";
     public static string SkyrimBodtLength8With42 = "Files/Skyrim/BodyTemplate/BodtLength8With42.esp";
     public static string SkyrimBodtLength12With42 = "Files/Skyrim/BodyTemplate/BodtLength12With42.esp";
     public static string SkyrimBodtLength8With43 = "Files/Skyrim/BodyTemplate/BodtLength8With43.esp";

diff --git a/Mutagen.Bethesda.UnitTests/Plugins/Records/Oblivion/StringLists.cs b/Mutagen.Bethesda.UnitTests/Plugins/Records/Oblivion/StringLists.cs
@@ -11,6 +11,21 @@ public class StringLists : ASpecificCaseTest<Creature, ICreatureGetter>
     public override GameRelease Release => GameRelease.Oblivion;
     public override bool TestPassthrough => false;
 
+    public override void TestItem(ICreatureGetter item)
+    {
+        item.Models.Should().Equal(
+            "NDAyleid.NIF",
+            "NDAyleidLegs.NIF",
+            "NDMinionHead.NIF");
+    }
+}
+
+public class MalformedStringLists : ASpecificCaseTest<Creature, ICreatureGetter>
+{
+    public override ModPath Path => TestDataPathing.OblivionMalformedStringLists;
+    public override GameRelease Release => GameRelease.Oblivion;
+    public override bool TestPassthrough => false;
+
     public override void TestItem(ICreatureGetter item)
     {
         item.Models.Should().Equal(