jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(gui): escape class- method and field names in frida code snippet (PR #1480)

Browse Source
This commit is contained in:
Jan S
2022-05-10 20:43:15 +02:00
committed by GitHub
parent a06df187c9
commit 65ade379a6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/main/java/jadx/gui/ui/codearea/FridaAction.java
+6 -5
View File
@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
import javax.swing.JOptionPane;
import org.apache.commons.text.StringEscapeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +74,7 @@ public final class FridaAction extends JNodeAction {
private String generateMethodSnippet(JMethod jMth) {
JavaMethod javaMethod = jMth.getJavaMethod();
MethodInfo methodInfo = javaMethod.getMethodNode().getMethodInfo();
String methodName = methodInfo.getName();
String methodName = StringEscapeUtils.escapeEcmaScript(methodInfo.getName());
if (methodInfo.isConstructor()) {
methodName = "$init";
}
@@ -83,9 +84,9 @@ public final class FridaAction extends JNodeAction {
if (isOverloaded(javaMethod.getMethodNode())) {
List<ArgType> methodArgs = methodInfo.getArgumentsTypes();
String overloadStr = methodArgs.stream().map(this::parseArgType).collect(Collectors.joining(", "));
functionUntilImplementation = String.format("%s.%s.overload(%s).implementation", shortClassName, methodName, overloadStr);
functionUntilImplementation = String.format("%s[\"%s\"].overload(%s).implementation", shortClassName, methodName, overloadStr);
} else {
functionUntilImplementation = String.format("%s.%s.implementation", shortClassName, methodName);
functionUntilImplementation = String.format("%s[\"%s\"].implementation", shortClassName, methodName);
}
String functionParametersString =
@@ -109,14 +110,14 @@ public final class FridaAction extends JNodeAction {
private String generateClassSnippet(JClass jc) {
JavaClass javaClass = jc.getCls();
String rawClassName = javaClass.getRawName();
String rawClassName = StringEscapeUtils.escapeEcmaScript(javaClass.getRawName());
String shortClassName = javaClass.getName();
return String.format("let %s = Java.use(\"%s\");", shortClassName, rawClassName);
}
private String generateFieldSnippet(JField jf) {
JavaField javaField = jf.getJavaField();
String rawFieldName = javaField.getRawName();
String rawFieldName = StringEscapeUtils.escapeEcmaScript(javaField.getRawName());
String fieldName = javaField.getName();
List<MethodNode> methodNodes = javaField.getFieldNode().getParentClass().getMethods();