Merge pull request #1959 from a-bahmani/patch-1

fix: prevent NPE when referencing a missing ResSpec
iBotPeaches · Feb 28, 2019 · c8d2a6a · c8d2a6a
2 parents 53fdd9f + 8e00de3
commit c8d2a6a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
@@ -39,7 +39,7 @@ public ResResSpec(ResID id, String name, ResPackage pkg, ResTypeSpec type) {
         if (resResSpec != null) {
             cleanName = name + "_APKTOOL_DUPLICATENAME_" + id.toString();
         } else {
-            cleanName = (name.isEmpty() ? ("APKTOOL_DUMMYVAL_" + id.toString()) : name);
+            cleanName = ((name == null || name.isEmpty()) ? ("APKTOOL_DUMMYVAL_" + id.toString()) : name);
         }
 
         this.mName = cleanName;