SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-09-22 06:45:03 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Fix yet more string data reading

Browse Source
This commit is contained in:
Matt Nadareski
2022-12-08 10:38:46 -08:00
parent ddf289d747
commit 713b1c83e1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BurnOutSharp.Builder/Extensions.cs
View File

@@ -1280,7 +1280,7 @@ namespace BurnOutSharp.Builder
versionInfo.Padding1 = entry.Data.ReadUInt16(ref offset);
// Read fixed file info
if (versionInfo.ValueLength != 0)
if (versionInfo.ValueLength > 0)
{
var fixedFileInfo = new Models.PortableExecutable.FixedFileInfo();
fixedFileInfo.Signature = entry.Data.ReadUInt32(ref offset);
@@ -1357,8 +1357,11 @@ namespace BurnOutSharp.Builder
while ((offset % 4) != 0)
stringData.Padding = entry.Data.ReadUInt16(ref offset);
if (stringData.ValueLength != 0)
stringData.Value = entry.Data.ReadString(ref offset, Encoding.Unicode);
if (stringData.ValueLength > 0)
{
byte[] valueBytes = entry.Data.ReadBytes(ref offset, stringData.ValueLength * sizeof(ushort));
stringData.Value = Encoding.Unicode.GetString(valueBytes);
}
while ((offset % 4) != 0)
_ = entry.Data.ReadUInt16(ref offset);
@@ -1472,8 +1475,11 @@ namespace BurnOutSharp.Builder
while ((offset % 4) != 0)
stringData.Padding = entry.Data.ReadUInt16(ref offset);
if (stringData.ValueLength != 0)
stringData.Value = entry.Data.ReadString(ref offset, Encoding.Unicode);
if (stringData.ValueLength > 0)
{
byte[] valueBytes = entry.Data.ReadBytes(ref offset, stringData.ValueLength * sizeof(ushort));
stringData.Value = Encoding.Unicode.GetString(valueBytes);
}
while ((offset % 4) != 0)
_ = entry.Data.ReadUInt16(ref offset);