Skip to content

fix: fix arg remap bug in InsertParamAndRemapIndices for Ldarg_1/Ldarg_2 #1

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

Merged
CedaryCat merged 1 commit into from
Feb 9, 2026
Merged

fix: fix arg remap bug in InsertParamAndRemapIndices for Ldarg_1/Ldarg_2 #1

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
24 changes: 8 additions & 16 deletions src/OTAPI.UnifiedServerProcess/Core/Patching/PatchingCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,38 +194,30 @@ public static void InsertParamAndRemapIndices(MethodBody body, int index, Parame
}
}

int insertedArgSlot = body.Method.IsStatic ? index : index + 1;
int shiftedLdarg3ParamIndex = body.Method.IsStatic ? 4 : 3;

foreach (Instruction instruction in body.Instructions) {
switch (instruction.OpCode.Code) {
case Code.Ldarg_0:
if (index == 0 && body.Method.IsStatic) {
if (insertedArgSlot <= 0) {
instruction.OpCode = OpCodes.Ldarg_1;
}
break;
case Code.Ldarg_1:
if (index <= 1) {
if (insertedArgSlot <= 1) {
instruction.OpCode = OpCodes.Ldarg_2;
}
break;
case Code.Ldarg_2:
if (index <= 2) {
if (insertedArgSlot <= 2) {
instruction.OpCode = OpCodes.Ldarg_3;
}
break;
case Code.Ldarg_3:
if (index <= 3) {
if (insertedArgSlot <= 3) {
instruction.OpCode = OpCodes.Ldarg_S;
int newindex;
if (body.Method.IsStatic) {
// static -> static (add inserted-param at first):
// [[arg0, arg1, arg2, <arg3>]] -> [[param, arg0, arg1, arg2, <arg3>]]
newindex = 4;
}
else {
// instance -> instance (add inserted-param after 'this'):
// [this, [arg0, arg1, <arg2>]] -> [this, [param, arg0, arg1, <arg2>]]
newindex = 3;
}
instruction.Operand = body.Method.Parameters[newindex];
instruction.Operand = body.Method.Parameters[shiftedLdarg3ParamIndex];
}
break;
case Code.Ldarg_S:
Expand Down
Loading