SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-04-29 01:50:24 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Fix PE import table parsing

Browse Source
This commit is contained in:
Matt Nadareski
2022-11-10 11:58:46 -08:00
parent c77c095893
commit 690c49ae1f
2 changed files with 84 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
BurnOutSharp.Builder/PortableExecutable.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using BurnOutSharp.Models.PortableExecutable;
namespace BurnOutSharp.Builder
@@ -873,10 +874,10 @@ namespace BurnOutSharp.Builder
}
// Lookup tables
var importLookupTables = new Dictionary<int, ImportLookupTableEntry[]>();
for (int i = 0; i < importTable.ImportDirectoryTable.Length; i++)
{
var importLookupTable = new Dictionary<int, ImportLookupTableEntry[]>();
var importDirectoryTableEntry = importTable.ImportDirectoryTable[i];
if (importDirectoryTableEntry.ImportLookupTableRVA != 0)
{
@@ -915,17 +916,17 @@ namespace BurnOutSharp.Builder
break;
}
importLookupTable[i] = entryLookupTable.ToArray();
importLookupTables[i] = entryLookupTable.ToArray();
}
importTable.ImportLookupTables = importLookupTable;
}
importTable.ImportLookupTables = importLookupTables;
// Address tables
var importAddressTables = new Dictionary<int, ImportAddressTableEntry[]>();
for (int i = 0; i < importTable.ImportDirectoryTable.Length; i++)
{
var importLookupTable = new Dictionary<int, ImportAddressTableEntry[]>();
var importDirectoryTableEntry = importTable.ImportDirectoryTable[i];
if (importDirectoryTableEntry.ImportAddressTableRVA != 0)
{
@@ -955,13 +956,42 @@ namespace BurnOutSharp.Builder
break;
}
importLookupTable[i] = entryAddressTable.ToArray();
importAddressTables[i] = entryAddressTable.ToArray();
}
importTable.ImportAddressTables = importLookupTable;
}
// TODO: Figure out how to find the hint/name table
importTable.ImportAddressTables = importAddressTables;
// Hint/Name table
if (importTable.ImportLookupTables != null && importTable.ImportLookupTables.Count > 0)
{
var importHintNameTable = new List<HintNameTableEntry>();
// Get the addresses of the hint/name table entries
List<int> hintNameTableEntryAddresses = importTable.ImportLookupTables
.SelectMany(kvp => kvp.Value)
.Select(ilte => (int)ilte.HintNameTableRVA.ConvertVirtualAddress(sections))
.Distinct()
.OrderBy(a => a)
.ToList();
// If we have any addresses, add them to the table
if (hintNameTableEntryAddresses.Any())
{
for (int i = 0; i < hintNameTableEntryAddresses.Count; i++)
{
int hintNameTableEntryAddress = hintNameTableEntryAddresses[i];
var hintNameTableEntry = new HintNameTableEntry();
hintNameTableEntry.Hint = data.ReadUInt16(ref hintNameTableEntryAddress);
hintNameTableEntry.Name = data.ReadString(ref hintNameTableEntryAddress, System.Text.Encoding.ASCII);
importHintNameTable.Add(hintNameTableEntry);
}
}
importTable.HintNameTable = importHintNameTable.ToArray();
}
return importTable;
}
@@ -1974,10 +2004,10 @@ namespace BurnOutSharp.Builder
}
// Lookup tables
var importLookupTables = new Dictionary<int, ImportLookupTableEntry[]>();
for (int i = 0; i < importTable.ImportDirectoryTable.Length; i++)
{
var importLookupTable = new Dictionary<int, ImportLookupTableEntry[]>();
var importDirectoryTableEntry = importTable.ImportDirectoryTable[i];
if (importDirectoryTableEntry.ImportLookupTableRVA != 0)
{
@@ -2018,17 +2048,17 @@ namespace BurnOutSharp.Builder
break;
}
importLookupTable[i] = entryLookupTable.ToArray();
importLookupTables[i] = entryLookupTable.ToArray();
}
importTable.ImportLookupTables = importLookupTable;
}
importTable.ImportLookupTables = importLookupTables;
// Address tables
var importAddressTables = new Dictionary<int, ImportAddressTableEntry[]>();
for (int i = 0; i < importTable.ImportDirectoryTable.Length; i++)
{
var importLookupTable = new Dictionary<int, ImportAddressTableEntry[]>();
var importDirectoryTableEntry = importTable.ImportDirectoryTable[i];
if (importDirectoryTableEntry.ImportAddressTableRVA != 0)
{
@@ -2060,13 +2090,44 @@ namespace BurnOutSharp.Builder
break;
}
importLookupTable[i] = entryAddressTable.ToArray();
importAddressTables[i] = entryAddressTable.ToArray();
}
importTable.ImportAddressTables = importLookupTable;
}
// TODO: Figure out how to find the hint/name table
importTable.ImportAddressTables = importAddressTables;
// Hint/Name table
if (importTable.ImportLookupTables != null && importTable.ImportLookupTables.Count > 0)
{
var importHintNameTable = new List<HintNameTableEntry>();
// Get the addresses of the hint/name table entries
List<int> hintNameTableEntryAddresses = importTable.ImportLookupTables
.SelectMany(kvp => kvp.Value)
.Select(ilte => (int)ilte.HintNameTableRVA.ConvertVirtualAddress(sections))
.Distinct()
.OrderBy(a => a)
.ToList();
// If we have any addresses, add them to the table
if (hintNameTableEntryAddresses.Any())
{
for (int i = 0; i < hintNameTableEntryAddresses.Count; i++)
{
int hintNameTableEntryAddress = hintNameTableEntryAddresses[i];
data.Seek(hintNameTableEntryAddress, SeekOrigin.Begin);
var hintNameTableEntry = new HintNameTableEntry();
hintNameTableEntry.Hint = data.ReadUInt16();
hintNameTableEntry.Name = data.ReadString(System.Text.Encoding.ASCII);
importHintNameTable.Add(hintNameTableEntry);
}
}
importTable.HintNameTable = importHintNameTable.ToArray();
}
return importTable;
}

2
BurnOutSharp.Models/PortableExecutable/HintNameTableEntry.cs
View File

@@ -18,6 +18,6 @@
/// must be matched to the public name in the DLL. This string is case sensitive
/// and terminated by a null byte.
/// </summary>
public byte[] Name;
public string Name;
}
}