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

Make relocation block parsing safer

Browse Source
This commit is contained in:
Matt Nadareski
2025-09-09 13:51:40 -04:00
parent 8e963ac62a
commit a230b39fbc
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,19 +329,22 @@ namespace SabreTools.Serialization.Deserializers
obj.PageRVA = data.ReadUInt32LittleEndian();
obj.BlockSize = data.ReadUInt32LittleEndian();
if (obj.BlockSize == 0)
return null;
if (obj.BlockSize <= 8)
return obj;
var entries = new List<BaseRelocationTypeOffsetFieldEntry>();
int totalSize = 8;
while (totalSize < obj.BlockSize && data.Position < data.Length)
// Guard against invalid block sizes
if (obj.BlockSize % 2 != 0)
return obj;
int entryCount = ((int)obj.BlockSize - 8) / 2;
obj.TypeOffsetFieldEntries = new BaseRelocationTypeOffsetFieldEntry[entryCount];
for (int i = 0; i < obj.TypeOffsetFieldEntries.Length; i++)
{
var entry = ParseBaseRelocationTypeOffsetFieldEntry(data);
entries.Add(entry);
totalSize += 2;
}
if (data.Position + 2 >= data.Length)
break;
obj.TypeOffsetFieldEntries = [.. entries];
obj.TypeOffsetFieldEntries[i] = ParseBaseRelocationTypeOffsetFieldEntry(data);
}
return obj;
}