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

bug fix

Browse source
This commit is contained in:
Jean-Marie Mineau 2024-01-04 10:38:07 +01:00
parent b17a84212f
commit d470881d98
Signed by: histausse
GPG key ID: B66AEEDA9B645AD2
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
androscalpel_serializer/src/items/code.rs
View file

@ -121,20 +121,19 @@ impl CodeItem {
i += 1; i += 1;
} }
for insn in &self.insns { for insn in &self.insns {
addr += insn.size() as u32; addr += insn.size() as u32 / 2;
while i < addresses.len() && addresses[i] == addr { while i < addresses.len() && addresses[i] == addr {
i += 1; i += 1;
} }
} }
if i < addresses.len() && addresses[i] < addr { if i < addresses.len() && addresses[i] < addr {
println!("{addresses:x?}");
return Err(Error::InconsistantStruct(format!( return Err(Error::InconsistantStruct(format!(
"Found an address in try block (0x{:x}) that does not align with an instruction", "Found an address in try block (0x{:x}) that does not align with an instruction",
addresses[i] addresses[i]
))); )));
} }
// TODO check goto addresses? pb: op code are not parsed so goto instruction are not known // TODO check goto and if addresses? pb: op code are not parsed so goto instruction are not known
Ok(()) Ok(())
} }