fix: properly read 'XML_TYPE_OVERLAY_POLICY'

iBotPeaches · Mar 23, 2023 · 82b1363 · 82b1363
1 parent 603e52d
commit 82b1363
Showing 1 changed file with 10 additions and 8 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
@@ -138,9 +138,15 @@ private ResPackage readTablePackage() throws IOException, AndrolibException {
                 case Header.XML_TYPE_OVERLAY:
                     readOverlaySpec();
                     break;
+                case Header.XML_TYPE_OVERLAY_POLICY:
+                    readOverlayPolicySpec();
+                    break;
                 case Header.XML_TYPE_STAGED_ALIAS:
                     readStagedAliasSpec();
                     break;
+                case Header.XML_TYPE_TYPE:
+                    readTableType();
+                    break;
                 default:
                     flag = false;
                     break;
@@ -163,9 +169,7 @@ private void readLibraryType() throws AndrolibException, IOException {
             LOGGER.info(String.format("Decoding Shared Library (%s), pkgId: %d", packageName, packageId));
         }
 
-        while(nextChunk().type == Header.XML_TYPE_TYPE) {
-            readTableTypeSpec();
-        }
+        nextChunk();
     }
 
     private void readStagedAliasSpec() throws IOException {
@@ -180,13 +184,11 @@ private void readStagedAliasSpec() throws IOException {
 
     private void readOverlaySpec() throws AndrolibException, IOException {
         checkChunkType(Header.XML_TYPE_OVERLAY);
-        String name = mIn.readNullEndedString(128, true);
-        String actor = mIn.readNullEndedString(128, true);
+        String name = mIn.readNullEndedString(256, true);
+        String actor = mIn.readNullEndedString(256, true);
         LOGGER.fine(String.format("Overlay name: \"%s\", actor: \"%s\")", name, actor));
 
-        while(nextChunk().type == Header.XML_TYPE_OVERLAY_POLICY) {
-            readOverlayPolicySpec();
-        }
+        nextChunk();
     }
 
     private void readOverlayPolicySpec() throws AndrolibException, IOException {