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

Make PE header reading even saferer

Browse Source
This commit is contained in:
Matt Nadareski
2024-06-05 22:22:22 -04:00
parent 1b412c3027
commit 11081efcb0
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
SabreTools.Serialization/Wrappers/PortableExecutable.cs
View File

@@ -33,20 +33,22 @@ namespace SabreTools.Serialization.Wrappers
// TODO: Don't scan the known header data as well
// If the section table is missing
// If any required pieces are missing
if (this.Model.Stub?.Header == null)
return [];
if (this.Model.SectionTable == null)
return null;
return [];
// Populate the raw header padding data based on the source
uint headerStartAddress = this.Model.Stub?.Header?.NewExeHeaderAddr ?? 0;
uint headerStartAddress = this.Model.Stub.Header.NewExeHeaderAddr;
uint firstSectionAddress = this.Model.SectionTable
.Select(s => s?.PointerToRawData ?? 0)
.Where(s => s != 0)
.Where(s => s != 0 && s >= headerStartAddress)
.OrderBy(s => s)
.First();
int headerLength = (int)(firstSectionAddress - headerStartAddress);
.FirstOrDefault();
// Check if the header length is more than 0 before reading data
int headerLength = (int)(firstSectionAddress - headerStartAddress);
if (headerLength <= 0)
_headerPaddingData = [];
else
@@ -73,20 +75,22 @@ namespace SabreTools.Serialization.Wrappers
// TODO: Don't scan the known header data as well
// If the section table is missing
// If any required pieces are missing
if (this.Model.Stub?.Header == null)
return [];
if (this.Model.SectionTable == null)
return null;
return [];
// Populate the raw header padding data based on the source
uint headerStartAddress = this.Model.Stub?.Header?.NewExeHeaderAddr ?? 0;
// Populate the header padding strings based on the source
uint headerStartAddress = this.Model.Stub.Header.NewExeHeaderAddr;
uint firstSectionAddress = this.Model.SectionTable
.Select(s => s?.PointerToRawData ?? 0)
.Where(s => s != 0)
.Where(s => s != 0 && s >= headerStartAddress)
.OrderBy(s => s)
.First();
int headerLength = (int)(firstSectionAddress - headerStartAddress);
.FirstOrDefault();
// Check if the header length is more than 0 before reading strings
int headerLength = (int)(firstSectionAddress - headerStartAddress);
if (headerLength <= 0)
_headerPaddingStrings = [];
else