Prevent loading from resource pool if type is not a resolveable resou…

…rce (#3187) * perf: prefer the shifted resId vs expensive package calls * fix: only lookup values if reference/value
iBotPeaches · Jul 21, 2023 · d4ec44d · d4ec44d
1 parent 2610033
commit d4ec44d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
@@ -387,7 +387,14 @@ public String getAttributeValue(int index) {
         if (mAttrDecoder != null) {
             try {
                 String stringBlockValue = valueRaw == -1 ? null : ResXmlEncoders.escapeXmlChars(mStringBlock.getString(valueRaw));
-                String resourceMapValue = mAttrDecoder.decodeFromResourceId(valueData);
+                String resourceMapValue = null;
+
+                // Ensure we only track down obfuscated values for reference/attribute type values. Otherwise we might
+                // spam lookups against resource table for invalid ids.
+                if (valueType == TypedValue.TYPE_REFERENCE || valueType == TypedValue.TYPE_DYNAMIC_REFERENCE ||
+                    valueType == TypedValue.TYPE_ATTRIBUTE || valueType == TypedValue.TYPE_DYNAMIC_ATTRIBUTE) {
+                    resourceMapValue = mAttrDecoder.decodeFromResourceId(valueData);
+                }
                 String value = stringBlockValue;
 
                 if (stringBlockValue != null && resourceMapValue != null) {

diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ResAttrDecoder.java
@@ -46,10 +46,8 @@ public String decodeFromResourceId(int attrResId)
         throws AndrolibException {
 
         if (attrResId != 0) {
-            ResID resId = new ResID(attrResId);
-
             try {
-                ResResSpec resResSpec = mResTable.getResSpec(resId);
+                ResResSpec resResSpec = mResTable.getResSpec(attrResId);
                 if (resResSpec != null) {
                     return resResSpec.getName();
                 }