ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-31 21:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Read .text section bytes from file instead of process memory (#2251)

Browse source 
* Read .text section bytes from file instead of memory

* format

* fix oversight

* only read bytes from file once
This commit is contained in:
Nukoooo 2025-08-05 06:55:34 +08:00 • committed by GitHub
parent 9ad0d86463
commit 83d32fe02c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Dalamud/Game/SigScanner.cs
View file

@ -7,7 +7,6 @@ using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using Iced.Intel; using Iced.Intel;
using Newtonsoft.Json; using Newtonsoft.Json;
using Serilog; using Serilog;
@ -21,6 +20,8 @@ namespace Dalamud.Game;
/// </summary> /// </summary>
public class SigScanner : IDisposable, ISigScanner public class SigScanner : IDisposable, ISigScanner
{ {
private static byte[]? fileBytes;
private readonly FileInfo? cacheFile; private readonly FileInfo? cacheFile;
private nint moduleCopyPtr; private nint moduleCopyPtr;
@ -51,12 +52,16 @@ public class SigScanner : IDisposable, ISigScanner
this.Is32BitProcess = !Environment.Is64BitProcess; this.Is32BitProcess = !Environment.Is64BitProcess;
this.IsCopy = doCopy; this.IsCopy = doCopy;
if (this.IsCopy)
{
this.SetupCopiedSegments();
fileBytes ??= File.ReadAllBytes(module.FileName);
}
// Limit the search space to .text section. // Limit the search space to .text section.
this.SetupSearchSpace(module); this.SetupSearchSpace(module);
if (this.IsCopy)
this.SetupCopiedSegments();
Log.Verbose($"Module base: 0x{this.TextSectionBase.ToInt64():X}"); Log.Verbose($"Module base: 0x{this.TextSectionBase.ToInt64():X}");
Log.Verbose($"Module size: 0x{this.TextSectionSize:X}"); Log.Verbose($"Module size: 0x{this.TextSectionSize:X}");
@ -494,6 +499,18 @@ public class SigScanner : IDisposable, ISigScanner
case 0x747865742E: // .text case 0x747865742E: // .text
this.TextSectionOffset = Marshal.ReadInt32(sectionCursor, 12); this.TextSectionOffset = Marshal.ReadInt32(sectionCursor, 12);
this.TextSectionSize = Marshal.ReadInt32(sectionCursor, 8); this.TextSectionSize = Marshal.ReadInt32(sectionCursor, 8);
if (this.IsCopy)
{
var pointerToRawData = Marshal.ReadInt32(sectionCursor, 20);
Marshal.Copy(
fileBytes.AsSpan(pointerToRawData, this.TextSectionSize).ToArray(),
0,
this.moduleCopyPtr + (nint)this.TextSectionOffset,
this.TextSectionSize);
}
break; break;
case 0x617461642E: // .data case 0x617461642E: // .data
this.DataSectionOffset = Marshal.ReadInt32(sectionCursor, 12); this.DataSectionOffset = Marshal.ReadInt32(sectionCursor, 12);