From e6434d2ec2b8383a254e90b5cd86a26d467bc995 Mon Sep 17 00:00:00 2001 From: tokatoka Date: Fri, 24 Dec 2021 15:46:27 +0900 Subject: [PATCH] fmt --- libafl_frida/src/drcov_rt.rs | 9 +++------ libafl_frida/src/helper.rs | 8 +++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libafl_frida/src/drcov_rt.rs b/libafl_frida/src/drcov_rt.rs index c08c18d36c..d2ef88b2f3 100644 --- a/libafl_frida/src/drcov_rt.rs +++ b/libafl_frida/src/drcov_rt.rs @@ -1,10 +1,9 @@ -use std::hash::Hasher; use ahash::AHasher; use libafl::inputs::{HasTargetBytes, Input}; -use libafl_targets::drcov::{DrCovBasicBlock, DrCovWriter}; use libafl::Error; +use libafl_targets::drcov::{DrCovBasicBlock, DrCovWriter}; use rangemap::RangeMap; - +use std::hash::Hasher; pub struct DrCovRuntime { pub drcov_basic_blocks: Vec, @@ -33,6 +32,4 @@ impl DrCovRuntime { Ok(()) } - - -} \ No newline at end of file +} diff --git a/libafl_frida/src/helper.rs b/libafl_frida/src/helper.rs index 1d4f583a85..2b035adc6f 100644 --- a/libafl_frida/src/helper.rs +++ b/libafl_frida/src/helper.rs @@ -1,6 +1,6 @@ use libafl::inputs::{HasTargetBytes, Input}; use libafl::Error; -use libafl_targets::drcov::{DrCovBasicBlock}; +use libafl_targets::drcov::DrCovBasicBlock; #[cfg(target_arch = "aarch64")] use capstone::{ @@ -113,7 +113,7 @@ impl<'a> FridaHelper<'a> for FridaInstrumentationHelper<'a> { fn pre_exec(&mut self, _input: &I) {} #[cfg(unix)] - fn pre_exec(&mut self, input: &I) -> Result<(), Error>{ + fn pre_exec(&mut self, input: &I) -> Result<(), Error> { let target_bytes = input.target_bytes(); let slice = target_bytes.as_slice(); //println!("target_bytes: {:#x}: {:02x?}", slice.as_ptr() as usize, slice); @@ -301,7 +301,9 @@ impl<'a> FridaInstrumentationHelper<'a> { helper.asan_runtime.real_address_for_stalked(pc(&context)); //let (range, (id, name)) = helper.ranges.get_key_value(&real_address).unwrap(); //println!("{}:0x{:016x}", name, real_address - range.start); - helper.drcov_runtime.drcov_basic_blocks + helper + .drcov_runtime + .drcov_basic_blocks .push(DrCovBasicBlock::new(real_address, real_address + 4)); }); }