feat: Add value and string search support to invokedynamic arguments

Col-E · May 22, 2021 · 659322e · 659322e
1 parent 71de3bf
commit 659322e
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/main/java/me/coley/recaf/search/SearchMethodVisitor.java b/src/main/java/me/coley/recaf/search/SearchMethodVisitor.java
@@ -6,12 +6,13 @@
 import me.coley.recaf.util.InsnUtil;
 import me.coley.recaf.util.Log;
 import org.objectweb.asm.*;
-import org.objectweb.asm.tree.*;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static me.coley.recaf.search.SearchCollector.*;
+import static me.coley.recaf.search.SearchCollector.ACC_NOT_FOUND;
 
 /**
  * Visitor that adds matched results in methods to a result collector.
@@ -222,6 +223,20 @@ public void visitInvokeDynamicInsn(String name, String descriptor, Handle handle
 									h.getOwner(), h.getName(), h.getDesc());
 							collector.addMatched(insnContext, q);
 						});
+			} else if (o instanceof String) {
+				String s = (String) o;
+				collector.queries(StringQuery.class)
+						.forEach(q -> {
+							q.match(s);
+							collector.addMatched(insnContext, q);
+						});
+			} else if (o instanceof Number) {
+				Number n = (Number) o;
+				collector.queries(ValueQuery.class)
+						.forEach(q -> {
+							q.match(n);
+							collector.addMatched(context.withInsn(last(), lastPos()), q);
+						});
 			}
 		}
 	}