Merge pull request #734 from lanvent/fix_escape

Fix: unescape string using apache library
Col-E · Oct 21, 2023 · 49d1661 · 49d1661
2 parents 59289b6 + fa15ee2
commit 49d1661
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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"
+
     }
 }
 

diff --git a/recaf-assembler/build.gradle b/recaf-assembler/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 
     api asm
     api asm_tree
-
+    api string_escape_utils
     api "com.github.Nowilltolife:Jasm:$jasmVersion"
 
     // Testing

diff --git a/...f-assembler/src/main/java/me/coley/recaf/assemble/transformer/AstToMethodTransformer.java b/...f-assembler/src/main/java/me/coley/recaf/assemble/transformer/AstToMethodTransformer.java
@@ -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;
@@ -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: