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

add more debug info in error

Browse source
This commit is contained in:
Jean-Marie 'Histausse' Mineau 2025-03-03 13:57:11 +01:00
parent d906c4d3d2
commit e2dc3381b6
Signed by: histausse
GPG key ID: B66AEEDA9B645AD2
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
androscalpel/src/dex_writer.rs
View file

@ -504,7 +504,7 @@ impl DexWriter {
} }
Instruction::Goto { label } => { Instruction::Goto { label } => {
let (min_addr, max_addr) = label_min_max_addrs.get(label).ok_or(anyhow!( let (min_addr, max_addr) = label_min_max_addrs.get(label).ok_or(anyhow!(
"Label {label} not found in label estimation map, known labels are {}", "Label {label} not found in label estimation map, known labels are [{}]",
label_min_max_addrs label_min_max_addrs
.keys() .keys()
.map(|string| string.as_str()) .map(|string| string.as_str())
@ -825,7 +825,7 @@ impl DexWriter {
format!( format!(
"Failed to convert instruction {} (found in code of {}) to raw instruction", "Failed to convert instruction {} (found in code of {}) to raw instruction",
ins.__repr__(), ins.__repr__(),
method_id.__repr__() method_id.__str__()
) )
})?; })?;
addr += ins.size() / 2; addr += ins.size() / 2;

14
androscalpel/src/instructions.rs
View file

@ -1978,8 +1978,13 @@ macro_rules! sanity_check_22b_or_22s {
macro_rules! raw_ins_if { macro_rules! raw_ins_if {
($ins_op:tt, $label_addrs:ident, $label:ident, $addr:ident, $r1:ident, $r2:ident) => {{ ($ins_op:tt, $label_addrs:ident, $label:ident, $addr:ident, $r1:ident, $r2:ident) => {{
let label_addr = $label_addrs.get($label).ok_or(anyhow!( let label_addr = $label_addrs.get($label).ok_or(anyhow!(
"Label {} not found in code, but found `if` with this label", "Label {} not found in code, but found `if` with this label. Known labels are [{}].",
$label, $label,
$label_addrs
.keys()
.map(|string| string.as_str())
.collect::<Vec<_>>()
.join(", ")
))?; ))?;
let branch_offset = *label_addr as i32 - $addr as i32; let branch_offset = *label_addr as i32 - $addr as i32;
if branch_offset > i16::MAX as i32 || branch_offset < i16::MIN as i32 { if branch_offset > i16::MAX as i32 || branch_offset < i16::MIN as i32 {
@ -1997,8 +2002,13 @@ macro_rules! raw_ins_if {
macro_rules! raw_ins_ifz { macro_rules! raw_ins_ifz {
($ins_op:tt, $label_addrs:ident, $label:ident, $addr:ident, $r1:ident) => {{ ($ins_op:tt, $label_addrs:ident, $label:ident, $addr:ident, $r1:ident) => {{
let label_addr = $label_addrs.get($label).ok_or(anyhow!( let label_addr = $label_addrs.get($label).ok_or(anyhow!(
"Label {} not found in code, but found `if` with this label", "Label {} not found in code, but found `if` with this label. Known labels are [{}].",
$label, $label,
$label_addrs
.keys()
.map(|string| string.as_str())
.collect::<Vec<_>>()
.join(", ")
))?; ))?;
let branch_offset = *label_addr as i32 - $addr as i32; let branch_offset = *label_addr as i32 - $addr as i32;
if branch_offset > i16::MAX as i32 || branch_offset < i16::MIN as i32 { if branch_offset > i16::MAX as i32 || branch_offset < i16::MIN as i32 {