mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-18 16:24:38 +00:00
fix(dex): preserve decode completeness and fixture UTF-16 encoding (#2164)
This commit is contained in:
1 parent
6a18b99d6f
commit
14176282fd
1 file changed
+45
@@ -745,6 +745,51 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::test_support::android as fx;
|
||||
|
||||
#[test]
|
||||
fn reference_queries_preserve_incomplete_decode_across_methods() {
|
||||
for incomplete in [false, true] {
|
||||
let mut builder = fx::DexBuilder::default();
|
||||
let class = builder.ty("LTest;");
|
||||
let first = builder.method("LTest;", "first", "V", &[]);
|
||||
let second = builder.method("LTest;", "second", "V", &[]);
|
||||
let mut first_code = vec![0x0071, second as u16, 0];
|
||||
if incomplete {
|
||||
first_code.push(0x0071); // truncated invoke-static
|
||||
}
|
||||
let code = |insns| Some(fx::CodeSpec { insns, ..Default::default() });
|
||||
builder.classes.push(fx::ClassSpec {
|
||||
class,
|
||||
direct: vec![
|
||||
fx::MethodSpec { method: first, access: 0, code: code(first_code) },
|
||||
fx::MethodSpec { method: second, access: 0, code: code(vec![0x000e]) },
|
||||
],
|
||||
..Default::default()
|
||||
});
|
||||
let data = builder.build();
|
||||
let dex = parse(&data).unwrap();
|
||||
let (found, truncated) = references(&dex, "LTest;", Some("second"), 10);
|
||||
assert_eq!(found.len(), 1);
|
||||
assert_eq!(found[0].caller, "LTest;->first()V");
|
||||
assert_eq!(found[0].target, "LTest;->second()V");
|
||||
assert_eq!(truncated, incomplete);
|
||||
let (absent, truncated) = references(&dex, "LAbsent;", None, 10);
|
||||
assert!(absent.is_empty());
|
||||
assert_eq!(truncated, incomplete);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fixture_strings_round_trip_utf16_surrogate_pairs() {
|
||||
let mut builder = fx::DexBuilder::default();
|
||||
let text = "A\0é😀";
|
||||
let index = builder.string(text);
|
||||
let data = builder.build();
|
||||
let dex = parse(&data).unwrap();
|
||||
assert_eq!(dex.string(index), text);
|
||||
let offset = Reader::new(&data).u32_le(0x70).unwrap() as usize;
|
||||
assert_eq!(&data[offset..offset + 13], &[5, 0x41, 0xc0, 0x80, 0xc3, 0xa9, 0xed, 0xa0, 0xbd, 0xed, 0xb8, 0x80, 0]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_fixture() {
|
||||
let data = fx::notes_dex();
|
||||
|
||||
Reference in new issue
Block a user