Fix end of file exception

Fix EOFException caused by pointing to the end of the file to express an empty string (or something not yet added?) in some dats For example: SkillSurgeEffects.dat
aianlinb · Jun 24, 2020 · b1c45ef · b1c45ef
1 parent 7e58b21
commit b1c45ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/LibDat/Types/TypeFactory.cs b/LibDat/Types/TypeFactory.cs
@@ -31,6 +31,8 @@ public static class TypeFactory
             {typeof (ulong), s => s.ReadUInt64()},
             {typeof (string), s =>
             {
+                if (s.BaseStream.Position == s.BaseStream.Length)
+                    return "{null}";    //Fix EOFException caused by pointing to the end of the file to express an empty string (or something not yet added?) in some dats
                 var sb = new StringBuilder();
                 char ch;
                 while ((ch = s.ReadChar()) != 0) { sb.Append(ch); }
@@ -54,6 +56,8 @@ public static class TypeFactory
             {typeof (ulong), (bw, o) => bw.Write((ulong)o)},
             {typeof (string), (bw, o) =>
             {
+                if (bw.BaseStream.Position == bw.BaseStream.Length)
+                    return;
                 foreach (var ch in (string)o)
                 {
                     bw.Write(ch);

diff --git a/LibDat/Types/TypeFactory64.cs b/LibDat/Types/TypeFactory64.cs
@@ -43,6 +43,8 @@ public static class TypeFactory64
              },
              {typeof (string), s =>
                 {
+                    if (s.BaseStream.Position == s.BaseStream.Length)
+                        return "{null}";    ////Fix EOFException caused by pointing to the end of the file to express an empty string (or something not yet added?) in some dats
                      var sb = new StringBuilder();
                      char ch;
                      while ((ch = s.ReadChar()) != 0) { sb.Append(ch); }
@@ -77,6 +79,8 @@ public static class TypeFactory64
             },
             {typeof (string), (bw, o) =>
                 {
+                    if (bw.BaseStream.Position == bw.BaseStream.Length)
+                        return;
                     foreach (var ch in (string)o)
                     {
                         bw.Write(ch);