fix bug when reading dex method & fields

Author: zsqw123

Cargo.toml

@@ -9,7 +9,7 @@ members = [
 ]
 
 [workspace.package]
-version = "0.0.11" # JAVA_ASM_VERSION
+version = "0.0.12" # JAVA_ASM_VERSION
 authors = ["zsqw123"]
 edition = "2021"
 license = "Apache-2.0"
@@ -20,9 +20,9 @@ homepage = "https://crates.io/crates/java_asm"
 readme = "README.md"
 
 [workspace.dependencies]
-java_asm_macro = { path = "asm_macro", version = "0.0.11" } # JAVA_ASM_VERSION
-java_asm = { path = "asm", version = "0.0.11" } # JAVA_ASM_VERSION
-java_asm_server = { path = "asm_server", version = "0.0.11" } # JAVA_ASM_VERSION
+java_asm_macro = { path = "asm_macro", version = "0.0.12" } # JAVA_ASM_VERSION
+java_asm = { path = "asm", version = "0.0.12" } # JAVA_ASM_VERSION
+java_asm_server = { path = "asm_server", version = "0.0.12" } # JAVA_ASM_VERSION
 
 enum_dispatch = "0.3.13"
 zip = "2.2.0"

asm/src/dex/element.rs

@@ -3,11 +3,7 @@ use crate::AsmResult;
 use crate::{DescriptorRef, StrRef};
 
 pub trait AsElement<E> {
-    fn to_element(&self, accessor: &DexFileAccessor, previous: Option<&Self>) -> AsmResult<E>;
-}
-
-pub struct DexElement {
-    
+    fn to_element(&self, accessor: &DexFileAccessor, previous_index: u32) -> AsmResult<(u32, E)>;
 }
 
 #[derive(Clone, Debug)]

asm/src/dex/mod.rs

@@ -69,7 +69,7 @@ impl DexFileAccessor {
     }
 
     pub fn get_class_element(&self, class_data_off: DUInt) -> AsmResult<ClassContentElement> {
-        self.get_data_impl::<ClassDataItem>(class_data_off)?.to_element(&self, None)
+        self.get_data_impl::<ClassDataItem>(class_data_off)?.to_element(&self)
     }
 
     pub fn get_class_smali(&self, class_def: ClassDef) -> AsmResult<SmaliNode> {

asm/src/impls/dex/r/element.rs

@@ -77,18 +77,11 @@ where
 {
     let vec_size = vec.len();
     let mut result = Vec::with_capacity(vec_size);
-    let mut index = 0;
-    while index < vec_size {
-        let previous = if index != 0 {
-            Some(&vec[index - 1])
-        } else {
-            None // cannot using `index - 1` because it may overflow when index is 0u32
-        };
-        // SAFETY: index is always less than vec_size
-        let c = vec.get(index).unwrap();
-        let element = c.to_element(accessor, previous)?;
+    let mut prev_index = 0;
+    for c in vec {
+        let (current_index, element) = c.to_element(accessor, prev_index)?;
+        prev_index = current_index;
         result.push(element);
-        index += 1;
     }
     Ok(result)
 }
@@ -120,9 +113,9 @@ fn read_method(
     MethodElement { access_flags, name, shorty_descriptor, return_type, parameters, code_off }.ok()
 }
 
-impl AsElement<ClassContentElement> for ClassDataItem {
-    fn to_element(
-        &self, accessor: &DexFileAccessor, _previous: Option<&ClassDataItem>,
+impl ClassDataItem {
+    pub(crate) fn to_element(
+        &self, accessor: &DexFileAccessor
     ) -> AsmResult<ClassContentElement> {
         let static_fields = to_element_list_impl(
             accessor, &self.static_fields,
@@ -145,20 +138,18 @@ impl AsElement<ClassContentElement> for ClassDataItem {
 
 impl AsElement<FieldElement> for EncodedField {
     fn to_element(
-        &self, accessor: &DexFileAccessor, previous: Option<&EncodedField>,
-    ) -> AsmResult<FieldElement> {
-        let previous_field_idx = previous.map_or(0, |f| f.field_idx_diff.value());
-        let field_idx = self.field_idx_diff.value() + previous_field_idx;
-        read_field(accessor, self, field_idx)
+        &self, accessor: &DexFileAccessor, previous_index: u32,
+    ) -> AsmResult<(u32, FieldElement)> {
+        let field_idx = self.field_idx_diff.value() + previous_index;
+        Ok((field_idx, read_field(accessor, self, field_idx)?))
     }
 }
 
 impl AsElement<MethodElement> for EncodedMethod {
     fn to_element(
-        &self, accessor: &DexFileAccessor, previous: Option<&EncodedMethod>,
-    ) -> AsmResult<MethodElement> {
-        let previous_method_idx = previous.map_or(0, |m| m.method_idx_diff.value());
-        let method_idx = self.method_idx_diff.value() + previous_method_idx;
-        read_method(accessor, self, method_idx)
+        &self, accessor: &DexFileAccessor, previous_index: u32,
+    ) -> AsmResult<(u32, MethodElement)> {
+        let method_idx = self.method_idx_diff.value() + previous_index;
+        Ok((method_idx, read_method(accessor, self, method_idx)?))
     }
 }

asm_egui/src/smali.rs

@@ -53,7 +53,10 @@ fn token(
             let text_ui = simple_text(ui, s.to_string(), font, smali_style.desc)
                 .on_hover_ui(|ui| {
                     ui.style_mut().interaction.selectable_labels = true;
-                    ui.label(format!("descriptor: {s}"));
+                    ui.horizontal(|ui| {
+                        ui.label(format!("1descriptor: {s}"));
+                        ui.label(format!("2descriptor: {s}"));
+                    });
                 });
             text_ui.context_menu(|ui| {
                 ui.label(format!("descriptor: {s}"));