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

Handle non-section data with valid RVA

Browse Source
This commit is contained in:
Matt Nadareski
2025-09-11 10:11:05 -04:00
parent 367aab0f83
commit b28bb93ccb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SabreTools.Serialization/Extensions.PortableExecutable.cs
View File

@@ -33,6 +33,7 @@ namespace SabreTools.Serialization
return rva - matchingSection.VirtualAddress + matchingSection.PointerToRawData;
// Loop through all of the sections
uint maxVirtualAddress = 0, maxRawPointer = 0;
for (int i = 0; i < sections.Length; i++)
{
// If the section "starts" at 0, just skip it
@@ -44,6 +45,13 @@ namespace SabreTools.Serialization
if (rva < section.VirtualAddress)
continue;
// Cache the maximum matching section data, in case of a miss
if (rva >= section.VirtualAddress)
{
maxVirtualAddress = section.VirtualAddress;
maxRawPointer = section.PointerToRawData;
}
// Attempt to derive the physical address from the current section
if (section.VirtualSize != 0 && rva <= section.VirtualAddress + section.VirtualSize)
return rva - section.VirtualAddress + section.PointerToRawData;
@@ -51,7 +59,7 @@ namespace SabreTools.Serialization
return rva - section.VirtualAddress + section.PointerToRawData;
}
return 0;
return maxRawPointer != 0 ? rva - maxVirtualAddress + maxRawPointer : 0;
}
/// <summary>