Avoid crash of the matcher when the obf name is invalid (set a deob it using the suffix '_auto_deob')

2 files changed, 30 insertions, 3 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
index e75485cd..83e22779 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package cuchaz.enigma.mapping;
 
+import cuchaz.enigma.throwables.IllegalNameException;
+
 public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<FieldEntry> {
 
     private String obfName;
@@ -49,8 +51,20 @@ public class FieldMapping implements Comparable<FieldMapping>, MemberMapping<Fie
         this.deobfName = NameValidator.validateFieldName(val);
     }
 
-    public void setObfName(String val) {
-        this.obfName = NameValidator.validateFieldName(val);
+    public void setObfName(String name) {
+        try
+        {
+            NameValidator.validateMethodName(name);
+        } catch (IllegalNameException ex)
+        {
+            // Invalid name, damn obfuscation! Map to a deob name with another name to avoid issues
+            if (this.deobfName == null)
+            {
+                System.err.println("WARNING: " + name + " is conflicting, auto deobfuscate to " + (name + "_auto_deob"));
+                setDeobfName(name + "_auto_deob");
+            }
+        }
+        this.obfName = name;
     }
 
     public Type getObfType() {
diff --git a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
index 455ff6b7..f973d6b7 100644
--- a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java
@@ -14,6 +14,7 @@ import com.google.common.collect.Maps;
 
 import java.util.Map;
 
+import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.throwables.MappingConflict;
 
 public class MethodMapping implements Comparable<MethodMapping>, MemberMapping<BehaviorEntry> {
@@ -75,7 +76,19 @@ public class MethodMapping implements Comparable<MethodMapping>, MemberMapping<B
     }
 
     public void setObfName(String name) {
-        this.obfName = NameValidator.validateMethodName(name);
+        try
+        {
+            NameValidator.validateMethodName(name);
+        } catch (IllegalNameException ex)
+        {
+            // Invalid name, damn obfuscation! Map to a deob name with another name to avoid issues
+            if (this.deobfName == null)
+            {
+                System.err.println("WARNING: " + name + " is conflicting, auto deobfuscate to " + (name + "_auto_deob"));
+                setDeobfName(name + "_auto_deob");
+            }
+        }
+        this.obfName = name;
     }
 
     public void setObfSignature(Signature val) {