fix: wrong parsing of class definitions in the dex module.

Author: plusvic

lib/src/modules/dex/parser.rs

@@ -459,9 +459,11 @@ impl Dex {
             return Ok((remainder, Vec::new()));
         }
 
-        // (class_idx, access_flags, superclass_idx, _, source_file_idx)
-        let mut it =
-            iterator(remainder, (le_u32, le_u32, le_u32, le_u32, le_u32));
+        // (class_idx, access_flags, superclass_idx, interfaces_off, source_file_idx, annotations_off, class_data_off, static_values_off)
+        let mut it = iterator(
+            remainder,
+            (le_u32::<&[u8], Error>, le_u32, le_u32, le_u32, le_u32, le_u32, le_u32, le_u32),
+        );
 
         let class_entries = it
             .by_ref()
@@ -474,6 +476,9 @@ impl Dex {
                     superclass_idx,
                     _,
                     source_file_idx,
+                    _,
+                    _,
+                    _,
                 )| {
                     let class = type_items.get(class_idx as usize)?.clone();
                     let superclass = if superclass_idx != Self::NO_INDEX {

lib/src/modules/dex/tests/testdata/b22108c4e0283e073bddac530bc1286515e078441d92a41e826578e0163d6faf.out

@@ -1529,23 +1529,36 @@ class_defs:
   - class: "Lorg/BasicActivity$1;"
     access_flags: 0x10  # ACC_FINAL
     superclass: "Ljava/lang/Object;"
-  - class: "Landroid/content/BroadcastReceiver;"
+  - class: "Lorg/BasicActivity$2;"
     access_flags: 0x0
-  - class: "I"
-    access_flags: 0x2f  # ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED | ACC_STATIC | ACC_SYNCHRONIZED
-    superclass: "J"
-    source_file: ".Loader"
-  - class: "I"
-    access_flags: 0x24  # ACC_PROTECTED | ACC_SYNCHRONIZED
-  - class: "I"
-    access_flags: 0xffffffff  # ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED | ACC_STATIC | ACC_FINAL | ACC_SYNCHRONIZED | ACC_BRIDGE | ACC_VARARGS | ACC_NATIVE | ACC_INTERFACE | ACC_ABSTRACT | ACC_STRICT | ACC_SYNTHETIC | ACC_ANNOTATION | ACC_ENUM | ACC_CONSTRUCTOR | ACC_DECLARED_SYNCHRONIZED
-    superclass: "I"
-    source_file: ".Loader"
-  - class: "Lorg/DevService$1;"
+    superclass: "Landroid/content/BroadcastReceiver;"
+  - class: "Lorg/BasicActivity;"
+    access_flags: 0x1  # ACC_PUBLIC
+    superclass: "Landroid/app/Activity;"
+  - class: "Lorg/CeonstReceiver$1;"
     access_flags: 0x0
+    superclass: "Ljava/lang/Object;"
+  - class: "Lorg/CeonstReceiver;"
+    access_flags: 0x1  # ACC_PUBLIC
     superclass: "Landroid/content/BroadcastReceiver;"
-  - class: "Landroid/app/Service;"
+  - class: "Lorg/DevService$1;"
     access_flags: 0x0
+    superclass: "Landroid/content/BroadcastReceiver;"
+  - class: "Lorg/DevService;"
+    access_flags: 0x1  # ACC_PUBLIC
+    superclass: "Landroid/app/Service;"
+  - class: "Lorg/KasReceiver;"
+    access_flags: 0x1  # ACC_PUBLIC
+    superclass: "Lorg/CeonstReceiver;"
+  - class: "Lorg/KseActivity;"
+    access_flags: 0x1  # ACC_PUBLIC
+    superclass: "Landroid/app/Activity;"
+  - class: "Lorg/MvReceiver;"
+    access_flags: 0x1  # ACC_PUBLIC
+    superclass: "Lorg/CeonstReceiver;"
+  - class: "Lorg/hskdAppli;"
+    access_flags: 0x1  # ACC_PUBLIC
+    superclass: "Landroid/app/Application;"
 map_list:
     size: 15
     items: