From ec6d8f652183e337645f5e5f86a8b2d9c9615c6b Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 7 Jul 2017 16:39:38 +0100 Subject: [PATCH] Add missing staticness check to ModifyConstant Injector --- .../asm/mixin/injection/invoke/InvokeInjector.java | 14 +++++++++----- .../mixin/injection/invoke/ModifyArgsInjector.java | 4 +--- .../injection/invoke/ModifyConstantInjector.java | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java index 1c240f2b..f1b3b8c5 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/InvokeInjector.java @@ -72,18 +72,22 @@ public abstract class InvokeInjector extends Injector { * @param target target */ protected void checkTarget(Target target) { - this.checkTargetModifiers(target); + this.checkTargetModifiers(target, true); } /** * Check that the static modifier of the target method matches the * handler * - * @param target + * @param target Target to check + * @param exactMatch True if static must match, false to only check if an + * instance handler is targetting a static method */ - protected final void checkTargetModifiers(Target target) { - if (target.isStatic != this.isStatic) { + protected final void checkTargetModifiers(Target target, boolean exactMatch) { + if (exactMatch && target.isStatic != this.isStatic) { throw new InvalidInjectionException(this.info, "'static' modifier of handler method does not match target in " + this); + } else if (!exactMatch && !this.isStatic && target.isStatic) { + throw new InvalidInjectionException(this.info, "non-static callback method " + this + " targets a static method which is not supported"); } } @@ -110,7 +114,7 @@ public abstract class InvokeInjector extends Injector { return; } } - this.checkTargetModifiers(target); + this.checkTargetModifiers(target, true); } /* (non-Javadoc) diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java index db3476a7..362cc4db 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyArgsInjector.java @@ -56,9 +56,7 @@ public class ModifyArgsInjector extends InvokeInjector { */ @Override protected void checkTarget(Target target) { - if (!this.isStatic && target.isStatic) { - throw new InvalidInjectionException(this.info, "non-static callback method " + this + " targets a static method which is not supported"); - } + this.checkTargetModifiers(target, false); } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java index d4c559f2..37fb2d5b 100644 --- a/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java +++ b/src/main/java/org/spongepowered/asm/mixin/injection/invoke/ModifyConstantInjector.java @@ -67,11 +67,13 @@ public class ModifyConstantInjector extends RedirectInjector { AbstractInsnNode targetNode = node.getCurrentTarget(); if (targetNode instanceof JumpInsnNode) { + this.checkTargetModifiers(target, false); this.injectExpandedConstantModifier(target, (JumpInsnNode)targetNode); return; } if (Bytecode.isConstant(targetNode)) { + this.checkTargetModifiers(target, false); this.injectConstantModifier(target, targetNode); return; }