SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-21 00:05:19 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Fix CFB stream name handling

Browse Source
This commit is contained in:
Matt Nadareski
2025-07-30 08:21:20 -04:00
parent 21dc72bf11
commit dbfdbbff20
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ namespace SabreTools.Serialization.Deserializers
var obj = new DirectoryEntry();
byte[] name = data.ReadBytes(64);
obj.Name = Encoding.Unicode.GetString(name).DecodeStreamName();
obj.Name = Encoding.Unicode.GetString(name).DecodeStreamName()?.TrimEnd('\0');
obj.NameLength = data.ReadUInt16LittleEndian();
obj.ObjectType = (ObjectType)data.ReadByteValue();
obj.ColorFlag = (ColorFlag)data.ReadByteValue();

2
SabreTools.Serialization/Extensions.CFB.cs
View File

@@ -57,7 +57,7 @@ namespace SabreTools.Serialization
}
output[q] = 0;
return Encoding.ASCII.GetString(output);
return Encoding.UTF8.GetString(output);
}
/// <summary>

2
SabreTools.Serialization/Printers/CFB.cs
View File

@@ -103,6 +103,8 @@ namespace SabreTools.Serialization.Printers
builder.AppendLine($" Directory Entry {i}");
builder.AppendLine(entry.Name?.TrimEnd('\0'), " Name");
if (entry.Name != null)
builder.AppendLine(Encoding.UTF8.GetBytes(entry.Name), " Name (bytes)");
builder.AppendLine(entry.NameLength, " Name length");
builder.AppendLine($" Object type: {entry.ObjectType} (0x{entry.ObjectType:X})");
builder.AppendLine($" Color flag: {entry.ColorFlag} (0x{entry.ColorFlag:X})");