SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-09-21 14:24:54 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Less EVORE code to fail

Browse Source
This commit is contained in:
Matt Nadareski
2020-11-12 22:33:18 -08:00
parent 3155b3fe41
commit 554520ae1f
4 changed files with 61 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
BurnOutSharp/EVORE.cs
View File

@@ -19,21 +19,13 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using BurnOutSharp.ExecutableType.Microsoft;
namespace BurnOutSharp
{
internal static class EVORE
{
// TODO: Replace this with BurnOutSharp.ExecutableType.Microsoft.IMAGE_SECTION_HEADER
internal struct Section
{
public uint iVirtualSize;
public uint iVirtualOffset;
public uint iRawOffset;
}
internal const int WaitSeconds = 20;
internal static Process StartSafe(string file)
{
if (file == null || !File.Exists(file))
@@ -48,11 +40,11 @@ namespace BurnOutSharp
{
startingprocess.Start();
}
catch (Exception ex)
catch
{
Console.WriteLine(ex.Message);
return null;
}
return startingprocess;
}
@@ -95,7 +87,7 @@ namespace BurnOutSharp
internal static string[] CopyDependentDlls(string file, byte[] fileContent)
{
Section[] sections = ReadSections(fileContent);
var sections = ReadSections(fileContent);
long lastPosition;
string[] saDependentDLLs = null;
@@ -151,47 +143,76 @@ namespace BurnOutSharp
return saDependentDLLs;
}
internal static Section[] ReadSections(byte[] fileContent)
internal static IMAGE_SECTION_HEADER?[] ReadSections(byte[] fileContent)
{
if (fileContent == null)
return null;
uint PEHeaderOffset = BitConverter.ToUInt32(fileContent, 60);
ushort NumberOfSections = BitConverter.ToUInt16(fileContent, (int)PEHeaderOffset + 6);
Section[] sections = new Section[NumberOfSections];
var sections = new IMAGE_SECTION_HEADER?[NumberOfSections];
int index = (int)PEHeaderOffset + 120 + 16 * 8;
for (int i = 0; i < NumberOfSections; i++)
{
index += 8;
uint ivs = BitConverter.ToUInt32(fileContent, index);
index += 4;
uint ivo = BitConverter.ToUInt32(fileContent, index);
index += 4;
index += 4;
uint iro = BitConverter.ToUInt32(fileContent, index);
index += 4;
index += 16;
sections[i] = new Section()
{
iVirtualSize = ivs,
iVirtualOffset = ivo,
iRawOffset = iro,
};
sections[i] = ReadSection(fileContent, index);
}
return sections;
}
internal static uint RVA2Offset(uint RVA, Section[] sections)
private static IMAGE_SECTION_HEADER? ReadSection(byte[] fileContent, int ptr)
{
int i = 0;
while (i != sections.Length)
// Get the size of a section header for later
int sectionSize = Marshal.SizeOf<IMAGE_SECTION_HEADER>();
// If the contents are null or the wrong size, we can't read a section
if (fileContent == null || fileContent.Length < sectionSize)
return null;
// Create a new section and try our best to read one
IMAGE_SECTION_HEADER? section = null;
IntPtr tempPtr = IntPtr.Zero;
try
{
if (sections[i].iVirtualOffset <= RVA && sections[i].iVirtualOffset + sections[i].iVirtualSize > RVA)
return RVA - sections[i].iVirtualOffset + sections[i].iRawOffset;
i++;
// Get the pointer to where the section will go
tempPtr = Marshal.AllocHGlobal(sectionSize);
// If we couldn't get the space, just return null
if (tempPtr == IntPtr.Zero)
return null;
// Copy from the array to the new space
Marshal.Copy(fileContent, ptr, tempPtr, sectionSize);
// Get the new section and return
section = Marshal.PtrToStructure<IMAGE_SECTION_HEADER>(tempPtr);
}
catch
{
// We don't care what the error was
return null;
}
finally
{
if (tempPtr != IntPtr.Zero)
Marshal.FreeHGlobal(tempPtr);
}
return section;
}
internal static uint RVA2Offset(uint RVA, IMAGE_SECTION_HEADER?[] sections)
{
for (int i = 0; i < sections.Length; i++)
{
if (!sections[i].HasValue)
continue;
var section = sections[i].Value;
if (section.VirtualAddress <= RVA && section.VirtualAddress + section.PhysicalAddressOrVirtualSize > RVA)
return RVA - section.VirtualAddress + section.PointerToRawData;
}
return 0;
}
}

2
BurnOutSharp/ProtectionType/ProtectDisc.cs
View File

@@ -261,7 +261,7 @@ namespace BurnOutSharp.ProtectionType
else if (processes[0].WorkingSet64 > exe.WorkingSet64) //else if (processes[0].Modules.Count > exe.Modules.Count)
exe = processes[0];
}
} while (processes.Length > 0 && DateTime.Now.Subtract(timestart).TotalSeconds < EVORE.WaitSeconds);
} while (processes.Length > 0 && DateTime.Now.Subtract(timestart).TotalSeconds < 20);
Thread.Sleep(500);
if (!exe.HasExited)

2
BurnOutSharp/ProtectionType/SafeDisc.cs
View File

@@ -290,7 +290,7 @@ namespace BurnOutSharp.ProtectionType
catch { }
}
}
} while (!exe.HasExited && DateTime.Now.Subtract(timestart).TotalSeconds < EVORE.WaitSeconds);
} while (!exe.HasExited && DateTime.Now.Subtract(timestart).TotalSeconds < 20);
if (!exe.HasExited)
exe.Kill();

2
BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs
View File

@@ -181,7 +181,7 @@ namespace BurnOutSharp.ProtectionType
else if (processes[0].WorkingSet64 > exe.WorkingSet64) //else if (processes[0].Modules.Count > exe.Modules.Count)
exe = processes[0];
}
} while (processes.Length > 0 && DateTime.Now.Subtract(timestart).TotalSeconds < EVORE.WaitSeconds);
} while (processes.Length > 0 && DateTime.Now.Subtract(timestart).TotalSeconds < 20);
Thread.Sleep(500);
if (!exe.HasExited)