From 024f8bf951ebc69b7f6361f3a378d042306581d7 Mon Sep 17 00:00:00 2001 From: mudkip Date: Sun, 14 May 2023 10:25:37 -0600 Subject: fix npe in mapping stats when package name is null (#504) --- .../src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java index 915f1c61..629793bd 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/stats/StatsGenerator.java @@ -66,8 +66,9 @@ public class StatsGenerator { .findFirst() .orElseThrow(AssertionError::new); ClassEntry clazz = root.getParent(); + final String packageName = this.mapper.deobfuscate(clazz).getPackageName(); - if (root == method && this.mapper.deobfuscate(clazz).getPackageName().startsWith(topLevelPackageSlash)) { + if (root == method && packageName != null && packageName.startsWith(topLevelPackageSlash)) { if (includedMembers.contains(StatsMember.METHODS) && !((MethodDefEntry) method).getAccess().isSynthetic()) { update(counts, method); totalMappable++; @@ -90,8 +91,9 @@ public class StatsGenerator { for (FieldEntry field : entryIndex.getFields()) { progress.step(numDone++, I18n.translate("type.fields")); ClassEntry clazz = field.getParent(); + final String packageName = this.mapper.deobfuscate(clazz).getPackageName(); - if (!((FieldDefEntry) field).getAccess().isSynthetic() && this.mapper.deobfuscate(clazz).getPackageName().startsWith(topLevelPackageSlash)) { + if (!((FieldDefEntry) field).getAccess().isSynthetic() && packageName != null && packageName.startsWith(topLevelPackageSlash)) { update(counts, field); totalMappable++; } -- cgit v1.2.3