Ensure instantiated objects are not blacklisted in plugin methods

IvMisticos · lukespragg · commit 7db9638fa56a · 2020-10-15T10:23:20.000-04:00
diff --git a/src/CompiledAssembly.cs b/src/CompiledAssembly.cs
@@ -169,13 +169,8 @@ private void PatchAssembly(Action<byte[]> callback)
                                 Instruction first = instructions.First();
 
                                 int i = 0;
-                                while (i < instructions.Count)
+                                while (i < instructions.Count && !changedMethod)
                                 {
-                                    if (changedMethod)
-                                    {
-                                        break;
-                                    }
-
                                     Instruction instruction = instructions[i];
                                     if (instruction.OpCode == OpCodes.Ldtoken)
                                     {
@@ -189,7 +184,7 @@ private void PatchAssembly(Action<byte[]> callback)
                                             changedMethod = true;
                                         }
                                     }
-                                    else if (instruction.OpCode == OpCodes.Call || instruction.OpCode == OpCodes.Calli || instruction.OpCode == OpCodes.Callvirt || instruction.OpCode == OpCodes.Ldftn)
+                                    else if (instruction.OpCode == OpCodes.Call || instruction.OpCode == OpCodes.Calli || instruction.OpCode == OpCodes.Callvirt || instruction.OpCode == OpCodes.Ldftn || instruction.OpCode == OpCodes.Newobj)
                                     {
                                         MethodReference methodCall = instruction.Operand as MethodReference;
                                         string fullNamespace = methodCall?.DeclaringType.FullName;

Original file line number	Diff line number	Diff line change
`@@ -169,13 +169,8 @@ private void PatchAssembly(Action<byte[]> callback)`
`169`	`169`	`Instruction first = instructions.First();`
`170`	`170`
`171`	`171`	`int i = 0;`
`172`		`- while (i < instructions.Count)`
	`172`	`+ while (i < instructions.Count && !changedMethod)`
`173`	`173`	`{`
`174`		`- if (changedMethod)`
`175`		`- {`
`176`		`- break;`
`177`		`- }`
`178`		`-`
`179`	`174`	`Instruction instruction = instructions[i];`
`180`	`175`	`if (instruction.OpCode == OpCodes.Ldtoken)`
`181`	`176`	`{`
`@@ -189,7 +184,7 @@ private void PatchAssembly(Action<byte[]> callback)`
`189`	`184`	`changedMethod = true;`
`190`	`185`	`}`
`191`	`186`	`}`
`192`		`- else if (instruction.OpCode == OpCodes.Call \|\| instruction.OpCode == OpCodes.Calli \|\| instruction.OpCode == OpCodes.Callvirt \|\| instruction.OpCode == OpCodes.Ldftn)`
	`187`	`+ else if (instruction.OpCode == OpCodes.Call \|\| instruction.OpCode == OpCodes.Calli \|\| instruction.OpCode == OpCodes.Callvirt \|\| instruction.OpCode == OpCodes.Ldftn \|\| instruction.OpCode == OpCodes.Newobj)`
`193`	`188`	`{`
`194`	`189`	`MethodReference methodCall = instruction.Operand as MethodReference;`
`195`	`190`	`string fullNamespace = methodCall?.DeclaringType.FullName;`