Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: unescape string using apache library #734

Merged
merged 1 commit into from
Oct 21, 2023
Merged

Fix: unescape string using apache library #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ subprojects {
ssvm = "com.github.xxdark:ssvm:$ssvmVersion"
procyon_core = "org.bitbucket.mstrobel:procyon-core:$procyonVersion"
procyon_compiler_tools = "org.bitbucket.mstrobel:procyon-compilertools:$procyonVersion"
string_escape_utils = "org.apache.commons:commons-text:1.10.0"

}
}

Expand Down
2 changes: 1 addition & 1 deletion recaf-assembler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

api asm
api asm_tree

api string_escape_utils
api "com.github.Nowilltolife:Jasm:$jasmVersion"

// Testing
Expand Down
3 changes: 2 additions & 1 deletion ...f-assembler/src/main/java/me/coley/recaf/assemble/transformer/AstToMethodTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.objectweb.asm.Handle;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.*;
import org.apache.commons.text.StringEscapeUtils;

import java.util.*;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -353,7 +354,7 @@ private InsnList createInstructions() throws MethodCompileException {
Object cst = ldc.getValue();
// TODO: We need to handle escapes better, but this works for \\u0000 escapes for now
if (cst instanceof String)
cst = EscapeUtil.unescape((String) cst);
cst = StringEscapeUtils.unescapeJava((String) cst);
addCode(list, instruction, new LdcInsnNode(cst));
break;
case TYPE:
Expand Down