Don't crash with a buffer underflow when packageCount == 0

hsiafan · May 11, 2020 · 01ef8bf · 01ef8bf
1 parent e10eeb1
commit 01ef8bf
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/net/dongliu/apk/parser/parser/ResourceTableParser.java b/src/main/java/net/dongliu/apk/parser/parser/ResourceTableParser.java
@@ -57,11 +57,13 @@ public void parse() {
         resourceTable = new ResourceTable();
         resourceTable.setStringPool(stringPool);
 
-        PackageHeader packageHeader = (PackageHeader) readChunkHeader();
-        for (int i = 0; i < resourceTableHeader.getPackageCount(); i++) {
-            Pair<ResourcePackage, PackageHeader> pair = readPackage(packageHeader);
-            resourceTable.addPackage(pair.getLeft());
-            packageHeader = pair.getRight();
+        if (resourceTableHeader.getPackageCount() != 0) {
+            PackageHeader packageHeader = (PackageHeader) readChunkHeader();
+            for (int i = 0; i < resourceTableHeader.getPackageCount(); i++) {
+                Pair<ResourcePackage, PackageHeader> pair = readPackage(packageHeader);
+                resourceTable.addPackage(pair.getLeft());
+                packageHeader = pair.getRight();
+            }
         }
     }