SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix windows build (#462)

Browse Source 
* fix

* fmt
This commit is contained in:
Dongjia Zhang 2022-01-10 04:57:43 +09:00 committed by GitHub
parent 5ac3cd6b5a
commit 82194c5fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libafl_frida/src/helper.rs
View File

@ -1,5 +1,7 @@
use libafl::inputs::{HasTargetBytes, Input}; use libafl::inputs::{HasTargetBytes, Input};
use libafl::Error; use libafl::Error;
#[cfg(unix)]
use libafl_targets::drcov::DrCovBasicBlock; use libafl_targets::drcov::DrCovBasicBlock;
#[cfg(feature = "cmplog")] #[cfg(feature = "cmplog")]
@ -22,14 +24,14 @@ use capstone::{
use core::fmt::{self, Debug, Formatter}; use core::fmt::{self, Debug, Formatter};
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
use frida_gum::instruction_writer::Aarch64Register; use frida_gum::instruction_writer::Aarch64Register;
#[cfg(target_arch = "x86_64")] #[cfg(all(target_arch = "x86_64", unix))]
use frida_gum::instruction_writer::X86Register; use frida_gum::instruction_writer::X86Register;
#[cfg(unix)] #[cfg(unix)]
use frida_gum::CpuContext; use frida_gum::CpuContext;
use frida_gum::{
instruction_writer::InstructionWriter, stalker::Transformer, Gum, Module, ModuleDetails, #[cfg(unix)]
ModuleMap, PageProtection, use frida_gum::instruction_writer::InstructionWriter;
}; use frida_gum::{stalker::Transformer, Gum, Module, ModuleDetails, ModuleMap, PageProtection};
#[cfg(unix)] #[cfg(unix)]
use nix::sys::mman::{mmap, MapFlags, ProtFlags}; use nix::sys::mman::{mmap, MapFlags, ProtFlags};
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
@ -91,14 +93,16 @@ impl Debug for FridaInstrumentationHelper<'_> {
let mut dbg_me = f.debug_struct("FridaInstrumentationHelper"); let mut dbg_me = f.debug_struct("FridaInstrumentationHelper");
dbg_me dbg_me
.field("coverage_rt", &self.coverage_rt) .field("coverage_rt", &self.coverage_rt)
.field("capstone", &self.capstone)
.field("asan_runtime", &self.asan_runtime)
.field("drcov_runtime", &self.drcov_runtime) .field("drcov_runtime", &self.drcov_runtime)
.field("ranges", &self.ranges) .field("ranges", &self.ranges)
.field("module_map", &"<ModuleMap>") .field("module_map", &"<ModuleMap>")
.field("options", &self.options); .field("options", &self.options);
#[cfg(feature = "cmplog")] #[cfg(feature = "cmplog")]
dbg_me.field("cmplog_runtime", &self.cmplog_runtime); dbg_me.field("cmplog_runtime", &self.cmplog_runtime);
#[cfg(unix)]
dbg_me.field("capstone", &self.capstone);
#[cfg(unix)]
dbg_me.field("asan_runtime", &self.asan_runtime);
dbg_me.finish() dbg_me.finish()
} }
} }
@ -115,7 +119,9 @@ impl<'a> FridaHelper<'a> for FridaInstrumentationHelper<'a> {
} }
#[cfg(not(unix))] #[cfg(not(unix))]
fn pre_exec<I: Input + HasTargetBytes>(&mut self, _input: &I) {} fn pre_exec<I: Input + HasTargetBytes>(&mut self, _input: &I) -> Result<(), Error> {
Ok(())
}
#[cfg(unix)] #[cfg(unix)]
fn pre_exec<I: Input + HasTargetBytes>(&mut self, input: &I) -> Result<(), Error> { fn pre_exec<I: Input + HasTargetBytes>(&mut self, input: &I) -> Result<(), Error> {