Prevent adding null names to the remapper

Vineflower · Sep 6, 2023 · d9b81ec · d9b81ec
1 parent 99b9298
commit d9b81ec
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -1614,7 +1614,12 @@ private void iterateClashingExprent(Statement stat, StructMethod mt, Map<Stateme
           }
 
           // Record the changed name if we didn't scope switch
-          nameMap.put(new VarInMethod(var.getVarVersionPair(), mt), scopedSwitch ? originalName : name);
+          String value = scopedSwitch ? originalName : name;
+          if (value == null) {
+            ValidationHelper.validateTrue(false, "Variable name is null");
+          } else {
+            nameMap.put(new VarInMethod(var.getVarVersionPair(), mt), value);
+          }
         }
       }
     }