From 6a18b99d6f719467780da4333e6b2b49a5c937fa Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 18 Nov 2026 01:01:37 -0500 Subject: [PATCH] fix(dex): report partial instruction decoding and encode fixture UTF-16 --- crates/dex/src/dex.rs | 55 ++++++++++++++++++++++++++++++++-- crates/dex/src/test_support.rs | 3 +- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/crates/dex/src/dex.rs b/crates/dex/src/dex.rs index 3ecc8224c..253af049c 100644 --- a/crates/dex/src/dex.rs +++ b/crates/dex/src/dex.rs @@ -691,7 +691,7 @@ pub struct Reference { const MAX_REFERENCE_BYTES: usize = 64 << 20; /// Every instruction that refers to class `desc` (optionally only its methods named `method`). -/// Returns a truncated prefix when the count or aggregate caller/target byte budget is exhausted. +/// Reports truncation when instruction decoding is incomplete or the count or byte budget is exhausted. pub fn references(dex: &Dex<'_>, desc: &str, method: Option<&str>, max: usize) -> (Vec, bool) { references_with_byte_limit(dex, desc, method, max, MAX_REFERENCE_BYTES) } @@ -699,11 +699,13 @@ pub fn references(dex: &Dex<'_>, desc: &str, method: Option<&str>, max: usize) - fn references_with_byte_limit(dex: &Dex<'_>, desc: &str, method: Option<&str>, max: usize, max_bytes: usize) -> (Vec, bool) { let mut bytes_left = max_bytes; let mut out = Vec::new(); + let mut complete = true; for c in &dex.classes { let cd = dex.class_data(c); for m in cd.direct_methods.iter().chain(&cd.virtual_methods) { let Some(code) = dex.code(m.code_off) else { continue }; - let (insns, _) = crate::dex_ops::decode(&code.insns, 200_000); + let (insns, decoded) = crate::dex_ops::decode(&code.insns, 200_000); + complete &= decoded; for i in &insns { let Some(idx) = i.index else { continue }; let hit = match i.index_kind { @@ -735,7 +737,7 @@ fn references_with_byte_limit(dex: &Dex<'_>, desc: &str, method: Option<&str>, m } } } - (out, false) + (out, !complete) } #[cfg(test)] @@ -990,4 +992,51 @@ mod tests { assert!(zero.is_empty()); assert_eq!(references(&dex, &desc, Some("run"), 100), (all, false)); } + #[test] + fn references_report_incomplete_instruction_decoding() { + for (insns, incomplete) in [(vec![0x000e], false), (vec![0x0071], true), (vec![0; 200_001], true)] { + let mut b = fx::DexBuilder::default(); + let class = b.ty("Ltest;"); + let method = b.method("Ltest;", "run", "V", &[]); + b.classes.push(fx::ClassSpec { + class, + direct: vec![fx::MethodSpec { method, access: 0, code: Some(fx::CodeSpec { insns, ..Default::default() }) }], + ..Default::default() + }); + let bytes = b.build(); + let dex = parse(&bytes).unwrap(); + let (hits, truncated) = references(&dex, "Lmissing;", None, 100); + assert!(hits.is_empty()); + assert_eq!(truncated, incomplete); + } + } + + #[test] + fn references_keep_incompleteness_across_later_complete_methods() { + let mut b = fx::DexBuilder::default(); + let class = b.ty("Ltest;"); + let broken = b.method("Ltest;", "broken", "V", &[]); + let complete = b.method("Ltest;", "complete", "V", &[]); + b.classes.push(fx::ClassSpec { + class, + direct: vec![ + fx::MethodSpec { method: broken, access: 0, code: Some(fx::CodeSpec { insns: vec![0x0071], ..Default::default() }) }, + fx::MethodSpec { method: complete, access: 0, code: Some(fx::CodeSpec { insns: vec![0x000e], ..Default::default() }) }, + ], + ..Default::default() + }); + let bytes = b.build(); + let dex = parse(&bytes).unwrap(); + assert_eq!(references(&dex, "Lmissing;", None, 100), (Vec::new(), true)); + } + + #[test] + fn fixture_strings_round_trip_supplementary_and_null_characters() { + let mut b = fx::DexBuilder::default(); + let text = "a\0é😀z"; + let id = b.string(text); + let bytes = b.build(); + let dex = parse(&bytes).unwrap(); + assert_eq!(dex.string(id), text); + } } diff --git a/crates/dex/src/test_support.rs b/crates/dex/src/test_support.rs index 5d50cd671..772a9f0e4 100644 --- a/crates/dex/src/test_support.rs +++ b/crates/dex/src/test_support.rs @@ -176,8 +176,7 @@ pub mod android { for s in &self.strings { string_offs.push(at(&d)); uleb(&mut d, s.encode_utf16().count() as u32); - for ch in s.chars() { - let c = ch as u32; + for c in s.encode_utf16() { if c == 0 { d.extend_from_slice(&[0xc0, 0x80]); } else if c < 0x80 {