Always quote matcher replacements

booky10 · Jul 5, 2023 · 4bfcb27 · 4bfcb27
1 parent 48279eb
commit 4bfcb27
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/main/java/dev/booky/stackdeobf/mappings/RemappingUtil.java b/src/main/java/dev/booky/stackdeobf/mappings/RemappingUtil.java
@@ -18,41 +18,40 @@ public static String remapClasses(String string) {
             int classId = Integer.parseInt(result.group(2));
             String className = CachedMappings.remapClass(classId);
             if (className == null) {
-                return result.group();
+                return Matcher.quoteReplacement(result.group());
             }
 
             String packageName = result.group(1);
             if (packageName != null) {
                 // a package has been specified, don't remove it
                 if (packageName.indexOf('.') == -1) {
                     // original package name contains "/" as package separator instead of "."
-                    return className.replace('.', '/');
+                    className = className.replace('.', '/');
+                }
+            } else {
+                // no package in original string, remove it
+                int packageIndex = className.lastIndexOf('.');
+                if (packageIndex != -1) {
+                    className = className.substring(packageIndex + 1);
                 }
-                return className;
-            }
-
-            // no package in original string, remove it
-            int packageIndex = className.lastIndexOf('.');
-            if (packageIndex != -1) {
-                className = className.substring(packageIndex + 1);
             }
-            return className;
+            return Matcher.quoteReplacement(className);
         });
     }
 
     public static String remapMethods(String string) {
         return METHOD_PATTERN.matcher(string).replaceAll(result -> {
             int methodId = Integer.parseInt(result.group(1));
             String methodName = CachedMappings.remapMethod(methodId);
-            return methodName == null ? result.group() : Matcher.quoteReplacement(methodName);
+            return Matcher.quoteReplacement(methodName == null ? result.group() : methodName);
         });
     }
 
     public static String remapFields(String string) {
         return FIELD_PATTERN.matcher(string).replaceAll(result -> {
             int fieldId = Integer.parseInt(result.group(1));
             String fieldName = CachedMappings.remapField(fieldId);
-            return fieldName == null ? result.group() : fieldName;
+            return Matcher.quoteReplacement(fieldName == null ? result.group() : fieldName);
         });
     }