From 04cd0c5710a97c9b1033bdd663531a6367b4a9ea Mon Sep 17 00:00:00 2001 From: HeroponRikiBestest <50224630+HeroponRikiBestest@users.noreply.github.com> Date: Sun, 2 Nov 2025 03:40:18 -0500 Subject: [PATCH 1/3] Fix extraction of recent MPF-zipped logs --- SabreTools.Serialization/Readers/PKZIP.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SabreTools.Serialization/Readers/PKZIP.cs b/SabreTools.Serialization/Readers/PKZIP.cs index 9e8a2f3b..5099f805 100644 --- a/SabreTools.Serialization/Readers/PKZIP.cs +++ b/SabreTools.Serialization/Readers/PKZIP.cs @@ -770,7 +770,8 @@ public class PKZIP : BaseBinaryReader obj.HeaderID = (HeaderID)data.ReadUInt16LittleEndian(ref offset); obj.DataSize = data.ReadUInt16LittleEndian(ref offset); - obj.Data = data.ReadBytes(ref offset, obj.DataSize); + if (obj.DataSize != 0) + obj.Data = data.ReadBytes(ref offset, obj.DataSize); return obj; } From ab8390632952b31b7dccbb03ba1b551fc6346116 Mon Sep 17 00:00:00 2001 From: HeroponRikiBestest <50224630+HeroponRikiBestest@users.noreply.github.com> Date: Sun, 2 Nov 2025 08:16:10 -0500 Subject: [PATCH 2/3] Use greater than or equal to --- SabreTools.Serialization/Readers/PKZIP.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SabreTools.Serialization/Readers/PKZIP.cs b/SabreTools.Serialization/Readers/PKZIP.cs index 5099f805..2bb5e339 100644 --- a/SabreTools.Serialization/Readers/PKZIP.cs +++ b/SabreTools.Serialization/Readers/PKZIP.cs @@ -770,7 +770,7 @@ public class PKZIP : BaseBinaryReader obj.HeaderID = (HeaderID)data.ReadUInt16LittleEndian(ref offset); obj.DataSize = data.ReadUInt16LittleEndian(ref offset); - if (obj.DataSize != 0) + if (obj.DataSize <= 0) obj.Data = data.ReadBytes(ref offset, obj.DataSize); return obj; From 91253904bda116b488f955f5fef40523de877106 Mon Sep 17 00:00:00 2001 From: HeroponRikiBestest <50224630+HeroponRikiBestest@users.noreply.github.com> Date: Sun, 2 Nov 2025 08:31:42 -0500 Subject: [PATCH 3/3] corrected logic --- SabreTools.Serialization/Readers/PKZIP.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SabreTools.Serialization/Readers/PKZIP.cs b/SabreTools.Serialization/Readers/PKZIP.cs index 2bb5e339..cba86597 100644 --- a/SabreTools.Serialization/Readers/PKZIP.cs +++ b/SabreTools.Serialization/Readers/PKZIP.cs @@ -770,7 +770,7 @@ public class PKZIP : BaseBinaryReader obj.HeaderID = (HeaderID)data.ReadUInt16LittleEndian(ref offset); obj.DataSize = data.ReadUInt16LittleEndian(ref offset); - if (obj.DataSize <= 0) + if (obj.DataSize > 0) obj.Data = data.ReadBytes(ref offset, obj.DataSize); return obj;