Fix NPE in DynFixMethodComparison

Sinytra · Jul 17, 2024 · ba6dadd · ba6dadd
1 parent 0302e00
commit ba6dadd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/...main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixArbitraryInjectionPoint.java b/...main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixArbitraryInjectionPoint.java
@@ -28,10 +28,13 @@ public record Data(MethodContext.TargetPair dirtyTarget, AbstractInsnNode cleanI
     @Override
     public Data prepare(MethodContext methodContext) {
         if (methodContext.methodAnnotation().matchesAny(ACCEPTED_ANNOTATIONS)) {
+            MethodContext.TargetPair dirtyInjectionTarget = methodContext.findDirtyInjectionTarget();
+            if (dirtyInjectionTarget == null) {
+                return null;
+            }
             MethodContext.TargetPair cleanInjectionTarget = methodContext.findCleanInjectionTarget();
             List<AbstractInsnNode> cleanInsns = methodContext.findInjectionTargetInsns(cleanInjectionTarget);
-            if (cleanInsns.size() == 1 && methodContext.failsDirtyInjectionCheck()) {
-                MethodContext.TargetPair dirtyInjectionTarget = methodContext.findDirtyInjectionTarget();
+            if (cleanInsns.size() == 1 && dirtyInjectionTarget != null && methodContext.failsDirtyInjectionCheck()) {
                 AbstractInsnNode cleanInjectionInsn = cleanInsns.getFirst();
                 return new Data(dirtyInjectionTarget, cleanInjectionInsn);
             }

diff --git a/...on/src/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixMethodComparison.java b/...on/src/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynFixMethodComparison.java
@@ -24,14 +24,16 @@
 import java.util.stream.Stream;
 
 public class DynFixMethodComparison implements DynamicFixer<DynFixMethodComparison.Data> {
-    public record Data(AbstractInsnNode cleanInjectionInsn) {
-    }
+    public record Data(AbstractInsnNode cleanInjectionInsn) {}
 
     @Nullable
     @Override
     public Data prepare(MethodContext methodContext) {
-        if (methodContext.methodAnnotation().matchesDesc(MixinConstants.INJECT)) {
+        if (methodContext.methodAnnotation().matchesDesc(MixinConstants.INJECT) && methodContext.findDirtyInjectionTarget() != null) {
             MethodContext.TargetPair cleanInjectionTarget = methodContext.findCleanInjectionTarget();
+            if (cleanInjectionTarget == null) {
+                return null;
+            }
             List<AbstractInsnNode> cleanInsns = methodContext.findInjectionTargetInsns(cleanInjectionTarget);
             if (cleanInsns.size() == 1) {
                 return new Data(cleanInsns.getFirst());

diff --git a/...rc/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynamicInjectionPointPatch.java b/...rc/main/java/org/sinytra/adapter/patch/transformer/dynfix/DynamicInjectionPointPatch.java
@@ -28,7 +28,7 @@ public class DynamicInjectionPointPatch implements MethodTransform {
 
     @Override
     public Patch.Result apply(ClassNode classNode, MethodNode methodNode, MethodContext methodContext, PatchContext context) {
-        if (methodContext.failsDirtyInjectionCheck()) {
+        if (methodContext.failsDirtyInjectionCheck() && methodContext.findCleanInjectionTarget() != null) {
             // TODO Only show in tests
             LOGGER.debug(MIXINPATCH, "Considering method {}.{}", classNode.name, methodNode.name);