fix: handle duplicate res entries during a complex resource (#3347)

iBotPeaches · Sep 30, 2023 · f63bbc0 · f63bbc0
1 parent aea1d68
commit f63bbc0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
@@ -415,6 +415,12 @@ private ResBagValue readComplexEntry() throws IOException, AndrolibException {
             resId = mIn.readInt();
             resValue = readValue();
 
+            // #2824 - In some applications the res entries are duplicated with the 2nd being malformed.
+            // AOSP skips this, so we will do the same.
+            if (resValue == null) {
+                continue;
+            }
+
             if (!(resValue instanceof ResScalarValue)) {
                 resValue = new ResStringValue(resValue.toString(), resValue.getRawIntValue());
             }