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

Correctly parse resource data

Browse Source
This commit is contained in:
Matt Nadareski
2025-09-11 09:21:31 -04:00
parent a00e6a5e2d
commit d575b6977e
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SabreTools.Serialization/Deserializers/PortableExecutable.cs
View File

@@ -275,6 +275,9 @@ namespace SabreTools.Serialization.Deserializers
int tableOffset = 0;
pex.ResourceDirectoryTable = ParseResourceDirectoryTable(tableData, ref tableOffset);
// Parse the resource data, if possible
ParseResourceData(data, initialOffset, pex.ResourceDirectoryTable, pex.SectionTable);
#region Hidden Resources
// If we have not used up the full size, parse the remaining chunk as a single resource
@@ -1513,6 +1516,36 @@ namespace SabreTools.Serialization.Deserializers
return obj;
}
/// <summary>
/// Fill in resource data
/// </summary>
/// <param name="data">Stream to parse</param>
/// <param name="initialOffset">Initial offset to use in address comparisons</param>
/// <param name="table">Resource table to fill in</param>
/// <param name="sections">Section table to use for virtual address translation</param>
/// <returns>Filled ResourceDataEntry on success, null on error</returns>
public static void ParseResourceData(Stream data, long initialOffset, ResourceDirectoryTable? table, SectionHeader[] sections)
{
if (table?.Entries == null)
return;
foreach (var entry in table.Entries)
{
// Handle directory entries directly
if (entry.DataEntry != null && entry.DataEntry.Size > 0)
{
// Read the data from the offset
long dataOffset = initialOffset + entry.DataEntry.DataRVA.ConvertVirtualAddress(sections);
if (dataOffset > initialOffset && dataOffset + entry.DataEntry.Size < data.Length)
entry.DataEntry.Data = data.ReadFrom(dataOffset, (int)entry.DataEntry.Size, retainPosition: true);
}
// Handle subdirectories by recursion
else if (entry.Subdirectory != null)
ParseResourceData(data, initialOffset, entry.Subdirectory, sections);
}
}
/// <summary>
/// Parse a byte array into an ResourceDataEntry
/// </summary>
@@ -1528,17 +1561,6 @@ namespace SabreTools.Serialization.Deserializers
obj.Codepage = data.ReadUInt32LittleEndian(ref offset);
obj.Reserved = data.ReadUInt32LittleEndian(ref offset);
// Ignore empty resources
if (obj.Size == 0)
return obj;
// Read the data from the offset
if (obj.DataRVA > 0 && obj.DataRVA + obj.Size < data.Length)
{
int dataOffset = (int)obj.DataRVA;
obj.Data = data.ReadBytes(ref dataOffset, (int)obj.Size);
}
return obj;
}