SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 14:55:11 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Fix some issues with CFB deserialization

Browse Source
This commit is contained in:
Matt Nadareski
2025-07-29 23:08:37 -04:00
parent 63514d149f
commit 7e543c6acb
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SabreTools.Serialization/Deserializers/CFB.cs
View File

@@ -247,8 +247,8 @@ namespace SabreTools.Serialization.Deserializers
{
var obj = new DirectoryEntry();
byte[] name = data.ReadBytes(32);
obj.Name = Encoding.Unicode.GetString(name).TrimEnd('\0');
byte[] name = data.ReadBytes(64);
obj.Name = Encoding.Unicode.GetString(name);
obj.NameLength = data.ReadUInt16LittleEndian();
obj.ObjectType = (ObjectType)data.ReadByteValue();
obj.ColorFlag = (ColorFlag)data.ReadByteValue();
@@ -332,11 +332,9 @@ namespace SabreTools.Serialization.Deserializers
/// <returns>Filled sector full of directory entries on success, null on error</returns>
private static DirectoryEntry[]? ParseDirectoryEntries(Stream data, ushort sectorShift, ushort majorVersion)
{
#if NET20 || NET35 || NET40
int directoryEntrySize = Marshal.SizeOf(new DirectoryEntry());
#else
int directoryEntrySize = Marshal.SizeOf<DirectoryEntry>();
#endif
// <see href="https://winprotocoldoc.z19.web.core.windows.net/MS-CFB/%5bMS-CFB%5d.pdf"/>
int directoryEntrySize = 128;
int sectorCount = (int)(Math.Pow(2, sectorShift) / directoryEntrySize);
var directoryEntries = new DirectoryEntry[sectorCount];