ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-12 10:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite redundant Result wraps (#616)

Browse Source
This commit is contained in:
Joe Ranweiler
2021-03-01 09:43:30 -08:00
committed by GitHub
parent 91bbcf7a59
commit 100e22a359
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/agent/coverage/src/block/windows.rs
View File

@ -94,7 +94,7 @@ impl BlockCoverageHandler {
dbg.quit_debugging(); dbg.quit_debugging();
} }
fn try_on_create_process(&mut self, dbg: &mut Debugger, module: &Module) -> Result<()> { fn handle_on_create_process(&mut self, dbg: &mut Debugger, module: &Module) -> Result<()> {
dbg.target().sym_initialize()?; dbg.target().sym_initialize()?;
log::info!( log::info!(
@ -108,7 +108,7 @@ impl BlockCoverageHandler {
Ok(()) Ok(())
} }
fn try_on_load_dll(&mut self, dbg: &mut Debugger, module: &Module) -> Result<()> { fn handle_on_load_dll(&mut self, dbg: &mut Debugger, module: &Module) {
log::info!( log::info!(
"dll loaded: {}, {} bytes", "dll loaded: {}, {} bytes",
module.path().display(), module.path().display(),
@ -116,11 +116,9 @@ impl BlockCoverageHandler {
); );
self.add_module(dbg, module); self.add_module(dbg, module);
Ok(())
} }
fn try_on_breakpoint(&mut self, dbg: &mut Debugger, bp: BreakpointId) -> Result<()> { fn handle_on_breakpoint(&mut self, dbg: &mut Debugger, bp: BreakpointId) -> Result<()> {
let (pc, _sym) = self.pc(dbg)?; let (pc, _sym) = self.pc(dbg)?;
if let Some(&(m, b)) = self.bp_to_block.get(&bp) { if let Some(&(m, b)) = self.bp_to_block.get(&bp) {
@ -139,38 +137,32 @@ impl BlockCoverageHandler {
Ok(()) Ok(())
} }
fn try_on_poll(&mut self, dbg: &mut Debugger) -> Result<()> { fn handle_on_poll(&mut self, dbg: &mut Debugger) {
if !self.timed_out && self.started.elapsed() > self.max_duration { if !self.timed_out && self.started.elapsed() > self.max_duration {
self.timed_out = true; self.timed_out = true;
dbg.quit_debugging(); dbg.quit_debugging();
} }
Ok(())
} }
} }
impl DebugEventHandler for BlockCoverageHandler { impl DebugEventHandler for BlockCoverageHandler {
fn on_create_process(&mut self, dbg: &mut Debugger, module: &Module) { fn on_create_process(&mut self, dbg: &mut Debugger, module: &Module) {
if self.try_on_create_process(dbg, module).is_err() { if self.handle_on_create_process(dbg, module).is_err() {
self.stop(dbg); self.stop(dbg);
} }
} }
fn on_load_dll(&mut self, dbg: &mut Debugger, module: &Module) { fn on_load_dll(&mut self, dbg: &mut Debugger, module: &Module) {
if self.try_on_load_dll(dbg, module).is_err() { self.handle_on_load_dll(dbg, module);
self.stop(dbg);
}
} }
fn on_breakpoint(&mut self, dbg: &mut Debugger, bp: BreakpointId) { fn on_breakpoint(&mut self, dbg: &mut Debugger, bp: BreakpointId) {
if self.try_on_breakpoint(dbg, bp).is_err() { if self.handle_on_breakpoint(dbg, bp).is_err() {
self.stop(dbg); self.stop(dbg);
} }
} }
fn on_poll(&mut self, dbg: &mut Debugger) { fn on_poll(&mut self, dbg: &mut Debugger) {
if self.try_on_poll(dbg).is_err() { self.handle_on_poll(dbg);
self.stop(dbg);
}
} }
} }