these-android-re/androscalpel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow multiple label at the same address when parsing .dex

Browse source
This commit is contained in:
Jean-Marie 'Histausse' Mineau 2025-03-03 15:03:39 +01:00
parent e2dc3381b6
commit be5922a726
Signed by: histausse
GPG key ID: B66AEEDA9B645AD2
1 changed files with 36 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

174
androscalpel/src/apk.rs
View file

@ -852,19 +852,20 @@ impl Apk {
} }
/// Convert an instruction format to an instruction. /// Convert an instruction format to an instruction.
#[allow(clippy::type_complexity)]
fn instruction_format_to_instruction<F>( fn instruction_format_to_instruction<F>(
format: &InsFormat, format: &InsFormat,
addr: usize, addr: usize,
insns_ref: &HashMap<usize, &InsFormat>, insns_ref: &HashMap<usize, &InsFormat>,
dex: &DexFileReader, dex: &DexFileReader,
label_ins: &mut F, label_ins: &mut F,
) -> Result<Option<(instructions::Instruction, HashMap<usize, String>)>> ) -> Result<Option<(instructions::Instruction, HashMap<usize, Vec<String>>)>>
where where
F: FnMut(&instructions::Instruction, usize) -> Option<String>, F: FnMut(&instructions::Instruction, usize) -> Option<String>,
{ {
use crate::instructions::*; use crate::instructions::*;
use InsFormat::*; use InsFormat::*;
let mut labels = HashMap::new(); let mut labels = HashMap::<_, Vec<_>>::new();
let ins = match format.clone() { let ins = match format.clone() {
Format10X { op: 0x00 } => Instruction::Nop {}, Format10X { op: 0x00 } => Instruction::Nop {},
Format12X { op: 0x01, va, vb } => Instruction::Move { Format12X { op: 0x01, va, vb } => Instruction::Move {
@ -1037,12 +1038,7 @@ impl Apk {
addr - (-(a as i64) as usize) addr - (-(a as i64) as usize)
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::Goto { label } Instruction::Goto { label }
} }
Format20T { op: 0x29, a } => { Format20T { op: 0x29, a } => {
@ -1055,12 +1051,7 @@ impl Apk {
addr - (-(a as i64) as usize) addr - (-(a as i64) as usize)
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::Goto { label } Instruction::Goto { label }
} }
Format30T { op: 0x2a, a } => { Format30T { op: 0x2a, a } => {
@ -1073,12 +1064,7 @@ impl Apk {
addr - (-(a as i64) as usize) addr - (-(a as i64) as usize)
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::Goto { label } Instruction::Goto { label }
} }
Format31T { op: 0x2b, va, b } => { Format31T { op: 0x2b, va, b } => {
@ -1110,15 +1096,7 @@ impl Apk {
addr - (-(target as i64) as usize) addr - (-(target as i64) as usize)
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!(
"There is already a label at 0x{dest_addr:08X} with \
an invalid name"
);
}
}
branches.insert(key, label); branches.insert(key, label);
key += 1; key += 1;
} }
@ -1164,15 +1142,7 @@ impl Apk {
addr - (-target as usize) addr - (-target as usize)
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!(
"There is already a label at 0x{dest_addr:08X} with \
an invalid name"
);
}
}
branches.insert(key, label); branches.insert(key, label);
} }
Instruction::Switch { reg: va, branches } Instruction::Switch { reg: va, branches }
@ -1257,12 +1227,7 @@ impl Apk {
addr - (-(c as i64)) as usize addr - (-(c as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfEq { Instruction::IfEq {
a: va, a: va,
b: vb, b: vb,
@ -1287,12 +1252,7 @@ impl Apk {
addr - (-(c as i64)) as usize addr - (-(c as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfNe { Instruction::IfNe {
a: va, a: va,
b: vb, b: vb,
@ -1317,12 +1277,7 @@ impl Apk {
addr - (-(c as i64)) as usize addr - (-(c as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfLt { Instruction::IfLt {
a: va, a: va,
b: vb, b: vb,
@ -1347,12 +1302,7 @@ impl Apk {
addr - (-(c as i64)) as usize addr - (-(c as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfGe { Instruction::IfGe {
a: va, a: va,
b: vb, b: vb,
@ -1377,12 +1327,7 @@ impl Apk {
addr - (-(c as i64)) as usize addr - (-(c as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfGt { Instruction::IfGt {
a: va, a: va,
b: vb, b: vb,
@ -1407,12 +1352,7 @@ impl Apk {
addr - (-(c as i64)) as usize addr - (-(c as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfLe { Instruction::IfLe {
a: va, a: va,
b: vb, b: vb,
@ -1432,12 +1372,7 @@ impl Apk {
addr - (-(b as i64)) as usize addr - (-(b as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfEqZ { a: va, label } Instruction::IfEqZ { a: va, label }
} }
Format21T { op: 0x39, va, b } => { Format21T { op: 0x39, va, b } => {
@ -1453,12 +1388,7 @@ impl Apk {
addr - (-(b as i64)) as usize addr - (-(b as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfNeZ { a: va, label } Instruction::IfNeZ { a: va, label }
} }
Format21T { op: 0x3a, va, b } => { Format21T { op: 0x3a, va, b } => {
@ -1474,12 +1404,7 @@ impl Apk {
addr - (-(b as i64)) as usize addr - (-(b as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfLtZ { a: va, label } Instruction::IfLtZ { a: va, label }
} }
Format21T { op: 0x3b, va, b } => { Format21T { op: 0x3b, va, b } => {
@ -1495,12 +1420,7 @@ impl Apk {
addr - (-(b as i64)) as usize addr - (-(b as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfGeZ { a: va, label } Instruction::IfGeZ { a: va, label }
} }
Format21T { op: 0x3c, va, b } => { Format21T { op: 0x3c, va, b } => {
@ -1516,12 +1436,7 @@ impl Apk {
addr - (-(b as i64)) as usize addr - (-(b as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfGtZ { a: va, label } Instruction::IfGtZ { a: va, label }
} }
Format21T { op: 0x3d, va, b } => { Format21T { op: 0x3d, va, b } => {
@ -1537,12 +1452,7 @@ impl Apk {
addr - (-(b as i64)) as usize addr - (-(b as i64)) as usize
}; };
let label = format!("label_{dest_addr:08X}"); let label = format!("label_{dest_addr:08X}");
if let Some(old_label) = labels.insert(dest_addr, label.clone()) { labels.entry(dest_addr).or_default().push(label.clone());
if old_label != label {
// TODO: internal error, panic?
bail!("There is already a label at 0x{dest_addr:08X} with an invalid name");
}
}
Instruction::IfLeZ { a: va, label } Instruction::IfLeZ { a: va, label }
} }
Format23X { Format23X {
@ -2666,7 +2576,7 @@ impl Apk {
.with_context(|| anyhow!("Invalid instruction {ins:?} found at {addr}: {format:?}"))?; .with_context(|| anyhow!("Invalid instruction {ins:?} found at {addr}: {format:?}"))?;
if let Some(label) = label_ins(&ins, addr) { if let Some(label) = label_ins(&ins, addr) {
//let label = format!("label_{addr:08X}"); //let label = format!("label_{addr:08X}");
labels.insert(addr, label); labels.entry(addr).or_default().push(label);
} }
Ok(Some((ins, labels))) Ok(Some((ins, labels)))
@ -2705,7 +2615,7 @@ impl Apk {
} else { } else {
(DebugInfo::EndOfData, None) (DebugInfo::EndOfData, None)
}; };
let mut labels: HashMap<usize, String> = HashMap::new(); let mut labels: HashMap<usize, Vec<String>> = HashMap::new();
let mut tries = HashMap::new(); let mut tries = HashMap::new();
for TryItem { for TryItem {
start_addr, start_addr,
@ -2725,12 +2635,7 @@ impl Apk {
.get_handler_at_offset(handler_off)?; .get_handler_at_offset(handler_off)?;
let default_handler = if let Some(Uleb128(addr)) = *catch_all_addr { let default_handler = if let Some(Uleb128(addr)) = *catch_all_addr {
let label = format!("label_{addr:08X}"); let label = format!("label_{addr:08X}");
if let Some(label_) = labels.insert(addr as usize, label.clone()) { labels.entry(addr as usize).or_default().push(label.clone());
if label_ != label {
// TODO: that's an internal error
bail!("Label collision at 0x{addr:08X}: {label_} and {label}");
}
}
Some(label) Some(label)
} else { } else {
None None
@ -2742,22 +2647,15 @@ impl Apk {
} in handlers.iter().cloned() } in handlers.iter().cloned()
{ {
let label = format!("label_{addr:08X}"); let label = format!("label_{addr:08X}");
if let Some(label_) = labels.insert(addr as usize, label.clone()) { labels.entry(addr as usize).or_default().push(label.clone());
if label_ != label {
// TODO: that's an internal error
bail!("Label collision at 0x{addr:08X}: {label_} and {label}");
}
}
handlers_.push((Self::get_id_type_from_idx(type_idx as usize, dex)?, label)) handlers_.push((Self::get_id_type_from_idx(type_idx as usize, dex)?, label))
} }
let dest_addr = start_addr + insn_count as u32; let dest_addr = start_addr + insn_count as u32;
let end_label = format!("label_{dest_addr:08X}"); let end_label = format!("label_{dest_addr:08X}");
if let Some(label_) = labels.insert(dest_addr as usize, end_label.clone()) { labels
if label_ != end_label { .entry(dest_addr as usize)
// TODO: that's an internal error .or_default()
bail!("Label collision at 0x{dest_addr:08X}: {label_} and {end_label}"); .push(end_label.clone());
}
}
let try_ = Instruction::Try { let try_ = Instruction::Try {
end_label, end_label,
handlers: handlers_, handlers: handlers_,
@ -2789,14 +2687,6 @@ impl Apk {
)? { )? {
instructions.push((addr, ins)); instructions.push((addr, ins));
addr += ins_f.size() / 2; addr += ins_f.size() / 2;
for (key, val) in &ins_labels {
if let Some(val_) = ins_labels.get(key) {
if val_ != val {
// TODO: internal error, panic?
bail!("Label collision at 0x{key:08X}: {val_} and {val}");
}
}
}
labels.extend(ins_labels); labels.extend(ins_labels);
} }
} }
@ -2852,9 +2742,11 @@ impl Apk {
if let Some(try_) = tries.remove(&addr) { if let Some(try_) = tries.remove(&addr) {
insns.push(try_); insns.push(try_);
} }
if let Some(label) = labels.remove(&addr) { if let Some(label_l) = labels.remove(&addr) {
for label in label_l.into_iter() {
insns.push(Instruction::Label { name: label }); insns.push(Instruction::Label { name: label });
} }
}
insns.push(ins); insns.push(ins);
} }
// notice: addr is not the same as the one in the loop, this one is computed previously // notice: addr is not the same as the one in the loop, this one is computed previously
@ -2862,9 +2754,11 @@ impl Apk {
if let Some(try_) = tries.remove(&addr) { if let Some(try_) = tries.remove(&addr) {
insns.push(try_); insns.push(try_);
} }
if let Some(label) = labels.remove(&addr) { if let Some(label_l) = labels.remove(&addr) {
for label in label_l.into_iter() {
insns.push(Instruction::Label { name: label }); insns.push(Instruction::Label { name: label });
} }
}
if !labels.is_empty() { if !labels.is_empty() {
bail!("Could not put all label as instructions (label out of insns?)"); bail!("Could not put all label as instructions (label out of insns?)");
} }