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

Cache the overlay length

Browse Source
This commit is contained in:
Matt Nadareski
2025-09-25 13:50:51 -04:00
parent 6eff6cf3b6
commit 963c333c2e
2 changed files with 138 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
SabreTools.Serialization/Wrappers/NewExecutable.cs
View File

@@ -129,18 +129,12 @@ namespace SabreTools.Serialization.Wrappers
return _overlayData;
}
// If a required property is missing
if (Header == null || SegmentTable == null || ResourceTable?.ResourceTypes == null)
{
_overlayData = [];
return _overlayData;
}
// Get the overlay address if possible
// Get the overlay address and size if possible
long endOfSectionData = OverlayAddress;
long overlaySize = OverlaySize;
// If we didn't find the end of section data
if (endOfSectionData <= 0)
// If we didn't find the address or size
if (endOfSectionData <= 0 || overlaySize <= 0)
{
_overlayData = [];
return _overlayData;
@@ -154,15 +148,67 @@ namespace SabreTools.Serialization.Wrappers
}
// Otherwise, cache and return the data
long overlayLength = dataLength - endOfSectionData;
overlayLength = Math.Min(overlayLength, int.MaxValue);
overlaySize = Math.Min(overlaySize, int.MaxValue);
_overlayData = ReadRangeFromSource((int)endOfSectionData, (int)overlayLength);
_overlayData = ReadRangeFromSource((int)endOfSectionData, (int)overlaySize);
return _overlayData;
}
}
}
/// <summary>
/// Size of the overlay data, if it exists
/// </summary>
/// <see href="https://codeberg.org/CYBERDEV/REWise/src/branch/master/src/exefile.c"/>
public long OverlaySize
{
get
{
lock (_overlaySizeLock)
{
// Use the cached data if possible
if (_overlaySize >= 0)
return _overlaySize;
// Get the available source length, if possible
long dataLength = Length;
if (dataLength == -1)
{
_overlaySize = 0;
return _overlaySize;
}
// If a required property is missing
if (Header == null || SegmentTable == null || ResourceTable?.ResourceTypes == null)
{
_overlaySize = 0;
return _overlaySize;
}
// Get the overlay address if possible
long endOfSectionData = OverlayAddress;
// If we didn't find the end of section data
if (endOfSectionData <= 0)
{
_overlaySize = 0;
return _overlaySize;
}
// If we're at the end of the file, cache an empty byte array
if (endOfSectionData >= dataLength)
{
_overlaySize = 0;
return _overlaySize;
}
// Otherwise, cache and return the data
_overlaySize = dataLength - endOfSectionData;
return _overlaySize;
}
}
}
/// <summary>
/// Overlay strings, if they exist
/// </summary>
@@ -265,6 +311,16 @@ namespace SabreTools.Serialization.Wrappers
/// </summary>
private readonly object _overlayDataLock = new();
/// <summary>
/// Size of the overlay data, if it exists
/// </summary>
private long _overlaySize = -1;
/// <summary>
/// Lock object for <see cref="_overlaySize"/>
/// </summary>
private readonly object _overlaySizeLock = new();
/// <summary>
/// Overlay strings, if they exist
/// </summary>

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

@@ -382,18 +382,12 @@ namespace SabreTools.Serialization.Wrappers
return _overlayData;
}
// If the section table is missing
if (SectionTable == null)
{
_overlayData = [];
return _overlayData;
}
// Get the overlay address if possible
// Get the overlay address and size if possible
long endOfSectionData = OverlayAddress;
long overlaySize = OverlaySize;
// If we didn't find the end of section data
if (endOfSectionData <= 0)
// If we didn't find the address or size
if (endOfSectionData <= 0 || overlaySize <= 0)
{
_overlayData = [];
return _overlayData;
@@ -407,15 +401,67 @@ namespace SabreTools.Serialization.Wrappers
}
// Otherwise, cache and return the data
long overlayLength = dataLength - endOfSectionData;
overlayLength = Math.Min(overlayLength, int.MaxValue);
overlaySize = Math.Min(overlaySize, int.MaxValue);
_overlayData = ReadRangeFromSource(endOfSectionData, (int)overlayLength) ?? [];
_overlayData = ReadRangeFromSource(endOfSectionData, (int)overlaySize) ?? [];
return _overlayData;
}
}
}
/// <summary>
/// Size of the overlay data, if it exists
/// </summary>
/// <see href="https://www.autoitscript.com/forum/topic/153277-pe-file-overlay-extraction/"/>
public long OverlaySize
{
get
{
lock (_overlaySizeLock)
{
// Use the cached data if possible
if (_overlaySize >= 0)
return _overlaySize;
// Get the available source length, if possible
long dataLength = Length;
if (dataLength == -1)
{
_overlaySize = 0;
return _overlaySize;
}
// If the section table is missing
if (SectionTable == null)
{
_overlaySize = 0;
return _overlaySize;
}
// Get the overlay address if possible
long endOfSectionData = OverlayAddress;
// If we didn't find the end of section data
if (endOfSectionData <= 0)
{
_overlaySize = 0;
return _overlaySize;
}
// If we're at the end of the file, cache an empty byte array
if (endOfSectionData >= dataLength)
{
_overlaySize = 0;
return _overlaySize;
}
// Otherwise, cache and return the length
_overlaySize = dataLength - endOfSectionData;
return _overlaySize;
}
}
}
/// <summary>
/// Overlay strings, if they exist
/// </summary>
@@ -928,6 +974,16 @@ namespace SabreTools.Serialization.Wrappers
/// </summary>
private readonly object _overlayDataLock = new();
/// <summary>
/// Size of the overlay data, if it exists
/// </summary>
private long _overlaySize = -1;
/// <summary>
/// Lock object for <see cref="_overlaySize"/>
/// </summary>
private readonly object _overlaySizeLock = new();
/// <summary>
/// Overlay strings, if they exist
/// </summary>