Skip to content

fix: harden hook and signature resolution for optimized IL2CPP builds #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hazre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: harden hook and signature resolution for optimized IL2CPP builds #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...pInterop.Runtime/Injection/Hooks/MetadataCache_GetTypeInfoFromTypeDefinitionIndex_Hook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Linq;
using System.Runtime.InteropServices;
using Il2CppInterop.Common;
Expand Down Expand Up @@ -75,8 +75,8 @@ private IntPtr FindGetTypeInfoFromTypeDefinitionIndex(bool forceICallMethod = fa
else getTypeInfoFromTypeDefinitionIndex = imageGetTypeXrefs[0];
if ((getTypeInfoFromTypeDefinitionIndex.ToInt64() & 0xF) != 0)
{
Logger.Instance.LogTrace("Image::GetType xref wasn't aligned, attempting to resolve from icall");
return FindGetTypeInfoFromTypeDefinitionIndex(true);
Logger.Instance.LogTrace("Image::GetType xref wasn't aligned, GetTypeInfoFromTypeDefinitionIndex is likely inlined into Image::GetType");
getTypeInfoFromTypeDefinitionIndex = imageGetType;
}
if (imageGetTypeXrefs.Count() > 1 && UnityVersionHandler.IsMetadataV29OrHigher)
{
Expand Down
4 changes: 2 additions & 2 deletions Il2CppInterop.Runtime/Injection/InjectorHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics;
Expand Down Expand Up @@ -187,7 +187,7 @@ static nint GetClassInitSubstitute()
}
nint pClassInit = s_ClassInitSignatures
.Select(s => MemoryUtils.FindSignatureInModule(Il2CppModule, s))
.FirstOrDefault(p => p != 0);
.FirstOrDefault(p => p != 0 && (long)p >= (long)Il2CppModule.BaseAddress && (long)p < (long)Il2CppModule.BaseAddress + Il2CppModule.ModuleMemorySize);

if (pClassInit == 0)
{
Expand Down
Loading